From owner-p4-projects@FreeBSD.ORG Sun Nov 8 00:11:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45FBB1065676; Sun, 8 Nov 2009 00:11:54 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A8DB1065694 for ; Sun, 8 Nov 2009 00:11:54 +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 EC87E8FC0C for ; Sun, 8 Nov 2009 00:11:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA80Brwc086887 for ; Sun, 8 Nov 2009 00:11:53 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA80BrOc086885 for perforce@freebsd.org; Sun, 8 Nov 2009 00:11:53 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 8 Nov 2009 00:11:53 GMT Message-Id: <200911080011.nA80BrOc086885@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 Precedence: bulk Cc: Subject: PERFORCE change 170336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 00:11:54 -0000 http://p4web.freebsd.org/chv.cgi?CH=170336 Change 170336 by rene@rene_self on 2009/11/08 00:11:08 [website] MFen where.sgml 1.100 -> 1.101 Affected files ... .. //depot/projects/docproj_nl/www/nl/where.sgml#11 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/where.sgml#11 (text+ko) ==== @@ -6,7 +6,7 @@ ]> &header; @@ -39,6 +39,8 @@ href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/mirrors.html">CD-ROM en DVD verkopers.

+ +

&os; downloaden

From owner-p4-projects@FreeBSD.ORG Sun Nov 8 10:43:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95B211065672; Sun, 8 Nov 2009 10:43:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59F50106566C for ; Sun, 8 Nov 2009 10:43:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 464128FC1E for ; Sun, 8 Nov 2009 10:43:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8AhPx8073293 for ; Sun, 8 Nov 2009 10:43:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8AhPvZ073291 for perforce@freebsd.org; Sun, 8 Nov 2009 10:43:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 8 Nov 2009 10:43:25 GMT Message-Id: <200911081043.nA8AhPvZ073291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 10:43:26 -0000 http://p4web.freebsd.org/chv.cgi?CH=170347 Change 170347 by hselasky@hselasky_laptop001 on 2009/11/08 10:43:19 LibUSB: - try to sync the libusb v1.0 API with v1.0.4 from sourceforge. Mostly add missing functions. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.h#10 edit .. //depot/projects/usb/src/lib/libusb/libusb10.c#13 edit .. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#10 edit .. //depot/projects/usb/src/lib/libusb/libusb10_io.c#10 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.h#10 (text+ko) ==== @@ -271,9 +271,11 @@ uint16_t wLength; } libusb_control_setup; +#define LIBUSB_CONTROL_SETUP_SIZE 8 /* bytes */ + typedef struct libusb_iso_packet_descriptor { - unsigned int length; - unsigned int actual_length; + uint32_t length; + uint32_t actual_length; enum libusb_transfer_status status; } libusb_iso_packet_descriptor __aligned(sizeof(void *)); @@ -282,9 +284,9 @@ typedef struct libusb_transfer { libusb_device_handle *dev_handle; uint8_t flags; - unsigned int endpoint; + uint32_t endpoint; uint8_t type; - unsigned int timeout; + uint32_t timeout; enum libusb_transfer_status status; int length; int actual_length; @@ -320,7 +322,7 @@ int libusb_set_configuration(libusb_device_handle * devh, int configuration); int libusb_claim_interface(libusb_device_handle * devh, int interface_number); int libusb_release_interface(libusb_device_handle * devh, int interface_number); -int libusb_reset_device(libusb_device_handle * dev); +int libusb_reset_device(libusb_device_handle * devh); int libusb_kernel_driver_active(libusb_device_handle * devh, int interface); int libusb_detach_kernel_driver(libusb_device_handle * devh, int interface); int libusb_attach_kernel_driver(libusb_device_handle * devh, int interface); @@ -333,7 +335,8 @@ int libusb_get_config_descriptor(libusb_device * dev, uint8_t config_index, struct libusb_config_descriptor **config); int libusb_get_config_descriptor_by_value(libusb_device * dev, uint8_t bConfigurationValue, struct libusb_config_descriptor **config); void libusb_free_config_descriptor(struct libusb_config_descriptor *config); -int libusb_get_string_descriptor_ascii(libusb_device_handle * dev, uint8_t desc_index, uint8_t *data, int length); +int libusb_get_string_descriptor_ascii(libusb_device_handle * devh, uint8_t desc_index, uint8_t *data, int length); +int libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, uint8_t desc_index, uint8_t *data, int length); /* Asynchronous device I/O */ @@ -341,7 +344,16 @@ void libusb_free_transfer(struct libusb_transfer *transfer); int libusb_submit_transfer(struct libusb_transfer *transfer); int libusb_cancel_transfer(struct libusb_transfer *transfer); -uint8_t *libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, unsigned int packet); +uint8_t *libusb_get_iso_packet_buffer(struct libusb_transfer *transfer, uint32_t index); +uint8_t *libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, uint32_t index); +void libusb_set_iso_packet_lengths(struct libusb_transfer *transfer, uint32_t length); +uint8_t *libusb_control_transfer_get_data(struct libusb_transfer *transfer); +struct libusb_control_setup *libusb_control_transfer_get_setup(struct libusb_transfer *transfer); +void libusb_fill_control_setup(uint8_t *buf, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint16_t wLength); +void libusb_fill_control_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t *buf, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout); +void libusb_fill_bulk_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout); +void libusb_fill_interrupt_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout); +void libusb_fill_iso_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, int npacket, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout); /* Polling and timing */ @@ -362,9 +374,14 @@ /* Synchronous device I/O */ -int libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength, unsigned int timeout); -int libusb_bulk_transfer(libusb_device_handle *devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, unsigned int timeout); -int libusb_interrupt_transfer(libusb_device_handle *devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, unsigned int timeout); +int libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength, uint32_t timeout); +int libusb_bulk_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout); +int libusb_interrupt_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout); + +/* Byte-order */ + +uint16_t libusb_cpu_to_le16(uint16_t x); +uint16_t libusb_le16_to_cpu(uint16_t x); #if 0 { /* indent fix */ ==== //depot/projects/usb/src/lib/libusb/libusb10.c#13 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include "libusb20.h" #include "libusb20_desc.h" @@ -1197,7 +1198,7 @@ struct libusb20_transfer *pxfer1; struct libusb_super_transfer *sxfer; struct libusb_device *dev; - unsigned int endpoint; + uint32_t endpoint; int err; if (uxfer == NULL) @@ -1254,7 +1255,7 @@ struct libusb20_transfer *pxfer1; struct libusb_super_transfer *sxfer; struct libusb_device *dev; - unsigned int endpoint; + uint32_t endpoint; if (uxfer == NULL) return (LIBUSB_ERROR_INVALID_PARAM); @@ -1314,3 +1315,16 @@ { /* TODO */ } + +uint16_t +libusb_cpu_to_le16(uint16_t x) +{ + return (htole16(x)); +} + +uint16_t +libusb_le16_to_cpu(uint16_t x) +{ + return (le16toh(x)); +} + ==== //depot/projects/usb/src/lib/libusb/libusb10_desc.c#10 (text+ko) ==== @@ -307,3 +307,12 @@ return (LIBUSB_ERROR_OTHER); } + +int +libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, + uint8_t desc_index, uint8_t *data, int length) +{ + return (libusb_control_transfer(devh, LIBUSB_ENDPOINT_IN, + LIBUSB_REQUEST_GET_DESCRIPTOR, (desc_type << 8) | desc_index, 0, data, + length, 1000)); +} ==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#10 (text+ko) ==== @@ -32,6 +32,7 @@ #include #include #include +#include #include "libusb20.h" #include "libusb20_desc.h" @@ -573,3 +574,160 @@ DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_interrupt_transfer leave"); return (ret); } + +uint8_t * +libusb_get_iso_packet_buffer(struct libusb_transfer *transfer, uint32_t index) +{ + uint8_t *ptr; + uint32_t n; + + if (transfer->num_iso_packets < 0) + return (NULL); + + if (index >= (uint32_t)transfer->num_iso_packets) + return (NULL); + + ptr = transfer->buffer; + if (ptr == NULL) + return (NULL); + + for (n = 0; n != index; n++) { + ptr += transfer->iso_packet_desc[n].length; + } + return (ptr); +} + +uint8_t * +libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, uint32_t index) +{ + uint8_t *ptr; + + if (transfer->num_iso_packets < 0) + return (NULL); + + if (index >= (uint32_t)transfer->num_iso_packets) + return (NULL); + + ptr = transfer->buffer; + if (ptr == NULL) + return (NULL); + + ptr += transfer->iso_packet_desc[0].length * index; + + return (ptr); +} + +void +libusb_set_iso_packet_lengths(struct libusb_transfer *transfer, uint32_t length) +{ + int n; + + if (transfer->num_iso_packets < 0) + return; + + for (n = 0; n != transfer->num_iso_packets; n++) + transfer->iso_packet_desc[n].length = length; +} + +uint8_t * +libusb_control_transfer_get_data(struct libusb_transfer *transfer) +{ + if (transfer->buffer == NULL) + return (NULL); + + return (transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE); +} + +struct libusb_control_setup * +libusb_control_transfer_get_setup(struct libusb_transfer *transfer) +{ + return ((struct libusb_control_setup *)transfer->buffer); +} + +void +libusb_fill_control_setup(uint8_t *buf, uint8_t bmRequestType, + uint8_t bRequest, uint16_t wValue, + uint16_t wIndex, uint16_t wLength) +{ + struct libusb_control_setup *req = (struct libusb_control_setup *)buf; + + /* The alignment is OK for all fields below. */ + req->bmRequestType = bmRequestType; + req->bRequest = bRequest; + req->wValue = htole16(wValue); + req->wIndex = htole16(wIndex); + req->wLength = htole16(wLength); +} + +void +libusb_fill_control_transfer(struct libusb_transfer *transfer, + libusb_device_handle *devh, uint8_t *buf, + libusb_transfer_cb_fn callback, void *user_data, + uint32_t timeout) +{ + struct libusb_control_setup *setup = (struct libusb_control_setup *)buf; + + transfer->dev_handle = devh; + transfer->endpoint = 0; + transfer->type = LIBUSB_TRANSFER_TYPE_CONTROL; + transfer->timeout = timeout; + transfer->buffer = buf; + if (setup != NULL) + transfer->length = LIBUSB_CONTROL_SETUP_SIZE + + le16toh(setup->wLength); + else + transfer->length = 0; + transfer->user_data = user_data; + transfer->callback = callback; + +} + +void +libusb_fill_bulk_transfer(struct libusb_transfer *transfer, + libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, + int length, libusb_transfer_cb_fn callback, void *user_data, + uint32_t timeout) +{ + transfer->dev_handle = devh; + transfer->endpoint = endpoint; + transfer->type = LIBUSB_TRANSFER_TYPE_BULK; + transfer->timeout = timeout; + transfer->buffer = buf; + transfer->length = length; + transfer->user_data = user_data; + transfer->callback = callback; +} + +void +libusb_fill_interrupt_transfer(struct libusb_transfer *transfer, + libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, + int length, libusb_transfer_cb_fn callback, void *user_data, + uint32_t timeout) +{ + transfer->dev_handle = devh; + transfer->endpoint = endpoint; + transfer->type = LIBUSB_TRANSFER_TYPE_INTERRUPT; + transfer->timeout = timeout; + transfer->buffer = buf; + transfer->length = length; + transfer->user_data = user_data; + transfer->callback = callback; +} + +void +libusb_fill_iso_transfer(struct libusb_transfer *transfer, + libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, + int length, int npacket, libusb_transfer_cb_fn callback, + void *user_data, uint32_t timeout) +{ + transfer->dev_handle = devh; + transfer->endpoint = endpoint; + transfer->type = LIBUSB_TRANSFER_TYPE_ISOCHRONOUS; + transfer->timeout = timeout; + transfer->buffer = buf; + transfer->length = length; + transfer->num_iso_packets = npacket; + transfer->user_data = user_data; + transfer->callback = callback; +} + From owner-p4-projects@FreeBSD.ORG Sun Nov 8 10:55:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA1741065670; Sun, 8 Nov 2009 10:55: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 6F2B2106566B for ; Sun, 8 Nov 2009 10:55:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5CA3A8FC08 for ; Sun, 8 Nov 2009 10:55:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8AtclU074146 for ; Sun, 8 Nov 2009 10:55:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8Atcns074144 for perforce@freebsd.org; Sun, 8 Nov 2009 10:55:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 8 Nov 2009 10:55:38 GMT Message-Id: <200911081055.nA8Atcns074144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170348 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 10:55:39 -0000 http://p4web.freebsd.org/chv.cgi?CH=170348 Change 170348 by hselasky@hselasky_laptop001 on 2009/11/08 10:54:42 LibUSB v1.0 - fix a possible device leak. Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.c#14 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb10.c#14 (text+ko) ==== @@ -186,8 +186,6 @@ /* create libusb v1.0 compliant devices */ i = 0; while ((pdev = libusb20_be_device_foreach(usb_backend, NULL))) { - /* get device into libUSB v1.0 list */ - libusb20_be_dequeue_device(usb_backend, pdev); dev = malloc(sizeof(*dev)); if (dev == NULL) { @@ -200,6 +198,10 @@ libusb20_be_free(usb_backend); return (LIBUSB_ERROR_NO_MEM); } + + /* get device into libUSB v1.0 list */ + libusb20_be_dequeue_device(usb_backend, pdev); + memset(dev, 0, sizeof(*dev)); /* init transfer queues */ From owner-p4-projects@FreeBSD.ORG Sun Nov 8 13:28:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BCF91065676; Sun, 8 Nov 2009 13:28:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C48A81065670 for ; Sun, 8 Nov 2009 13:28: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 988438FC18 for ; Sun, 8 Nov 2009 13:28:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8DSCUK098392 for ; Sun, 8 Nov 2009 13:28:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8DSCu2098390 for perforce@freebsd.org; Sun, 8 Nov 2009 13:28:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 8 Nov 2009 13:28:12 GMT Message-Id: <200911081328.nA8DSCu2098390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170355 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 13:28:13 -0000 http://p4web.freebsd.org/chv.cgi?CH=170355 Change 170355 by hselasky@hselasky_laptop001 on 2009/11/08 13:27:55 USB controller: - adjust debug output - suggested by Alexander Nedotsukov Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#41 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#41 (text+ko) ==== @@ -1498,7 +1498,8 @@ { ehci_softc_t *sc = arg; - DPRINTFN(3, "ehci_intrq_timeout\n"); + DPRINTFN(3, "\n"); + ehci_interrupt_poll(sc); } From owner-p4-projects@FreeBSD.ORG Sun Nov 8 14:02:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D37E1065679; Sun, 8 Nov 2009 14:02:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D54CA1065672 for ; Sun, 8 Nov 2009 14:02:47 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C17448FC0C for ; Sun, 8 Nov 2009 14:02:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8E2lC9001126 for ; Sun, 8 Nov 2009 14:02:47 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8E2ltw001124 for perforce@freebsd.org; Sun, 8 Nov 2009 14:02:47 GMT (envelope-from mav@freebsd.org) Date: Sun, 8 Nov 2009 14:02:47 GMT Message-Id: <200911081402.nA8E2ltw001124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 14:02:48 -0000 http://p4web.freebsd.org/chv.cgi?CH=170357 Change 170357 by mav@mav_mavbook on 2009/11/08 14:02:33 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/sh/arith_lex.l#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/mmap.2#5 integrate .. //depot/projects/scottl-camlock/src/lib/libkvm/kvm_i386.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libstand/udp.c#2 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#3 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/chpmon.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/eltsub.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/eltsub.h#1 branch .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getencstat.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getnobj.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getobjmap.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getobjstat.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/inienc.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/sesd.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/setencstat.c#2 integrate .. //depot/projects/scottl-camlock/src/share/examples/ses/srcs/setobjstat.c#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ata.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/hptrr.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/msk.4#6 integrate .. //depot/projects/scottl-camlock/src/share/misc/iso3166#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/identcpu.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mp_machdep.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/db_trace.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#41 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ipc.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/altq/altq/altq_hfsc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_ec.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_hpet.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpivar.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_isa.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_pccard.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_anreg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hatm/if_hatm.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichwd/ichwd.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgb/if_ixgb.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ixgbe/ixgbe.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_mskreg.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/nfe/if_nfe.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/patm/if_patm_attach.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sk/if_sk.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/stge/if_stge.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/fifofs/fifo_vnops.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/ext2fs/ext2_vnops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ichwd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ef.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_eiface.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_fec.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_iface.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_sppp.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_output.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mman.h#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/sh/arith_lex.l#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.24 2005/08/13 07:59:46 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.25 2009/11/05 20:44:39 jilles Exp $"); #include @@ -51,6 +51,13 @@ int yylex(void); +struct varname +{ + struct varname *next; + char name[1]; +}; +static struct varname *varnames; + #undef YY_INPUT #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; @@ -80,11 +87,14 @@ * If variable doesn't exist, we should initialize * it to zero. */ - char *temp; + struct varname *temp; if (lookupvar(yytext) == NULL) setvarsafe(yytext, "0", 0); - temp = (char *)ckmalloc(strlen(yytext) + 1); - yylval.s_value = strcpy(temp, yytext); + temp = ckmalloc(sizeof(struct varname) + + strlen(yytext)); + temp->next = varnames; + varnames = temp; + yylval.s_value = strcpy(temp->name, yytext); return ARITH_VAR; } @@ -130,5 +140,15 @@ void arith_lex_reset(void) { + struct varname *name, *next; + YY_NEW_FILE; + + name = varnames; + while (name != NULL) { + next = name->next; + ckfree(name); + name = next; + } + varnames = NULL; } ==== //depot/projects/scottl-camlock/src/contrib/bind9/bin/dig/dighost.c#4 (text+ko) ==== @@ -2604,10 +2604,12 @@ if (sevent->result == ISC_R_CANCELED) { debug("in cancel handler"); - isc_socket_detach(&query->sock); - sockcount--; - INSIST(sockcount >= 0); - debug("sockcount=%d", sockcount); + if (query->sock != NULL) { + isc_socket_detach(&query->sock); + sockcount--; + INSIST(sockcount >= 0); + debug("sockcount=%d", sockcount); + } query->waiting_connect = ISC_FALSE; isc_event_free(&event); l = query->lookup; ==== //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.277 2009/10/06 02:13:32 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.280 2009/11/07 22:13:29 dougb Exp $ % ======================================================================= || || @@ -69,6 +69,17 @@ -- CommUNIXque 1:1, ASCAR Business Systems % + 1/2 + 12 + 144 + 20 + 3*4 2 + ---------------------- + 5 * 11 = 9 + 0 + 7 + +A dozen, a gross and a score, +Plus three times the square root of four, + Divided by seven, + Plus five times eleven, +Equals nine squared plus zero, no more! +% -- Gifts for Children -- This is easy. You never have to figure out what to get for children, @@ -674,17 +685,6 @@ % ... with liberty and justice for all who can afford it. % - 1/2 - 12 + 144 + 20 + 3*4 2 - ---------------------- + 5 * 11 = 9 + 0 - 7 - -A dozen, a gross and a score, -Plus three times the square root of four, - Divided by seven, - Plus five times eleven, -Equals nine squared plus zero, no more! -% 7,140 pounds on the Sun 97 pounds on Mercury or Mars 255 pounds on Earth @@ -2516,12 +2516,6 @@ yourself for far less money. This article can help you. -- Dave Barry, "The Taming of the Screw" % - I'd say that VCS is more like the anal sex of the software -world: Everybody talks about it, some people do it, some people enjoy -it, but typically only vague implications about the best techniques -are ever voiced in public. - -- Warner Losh, on Version Control Systems -% "I'll tell you what I know, then," he decided. "The pin I'm wearing means I'm a member of the IA. That's Inamorati Anonymous. An inamorato is somebody in love. That's the worst addiction of all." @@ -25228,7 +25222,8 @@ -- Sylvestre Matuschka, "the Hungarian Train Wreck Freak", escaped prison 1937, not heard from since % -Iam +I +am not very happy @@ -33070,6 +33065,10 @@ % May a Misguided Platypus lay its Eggs in your Jockey Shorts % +May all your Emus lay soft boiled eggs, and may all your +Kangaroos be born with iPods already fitted. + -- Aussie New Years wish, found on hasselbladinfo.com +% May all your PUSHes be POPped. % May Euell Gibbons eat your only copy of the manual! @@ -59769,6 +59768,17 @@ and now you're telling me just to be myself? -- The Return of the Secaucus Seven % +You've decked the halls with a dozen miles' length of electric lights. +Your front lawn is a gleaming testament of incandescent wonder. The neighbors +wear sunglasses 24/7, and orbiting satellites have officially picked up +and pinpointed your house as the brightest spot on earth. + +You've finally put together the Christmas wonderland of your dreams... now +if only you could get a good picture of it. + +Photographing holiday lights is no easy task. + -- from an email sent by photojojo.com +% You've got to have a gimmick if your band sucks. -- Gary Giddens % @@ -59809,18 +59819,3 @@ Zymurgy's Law of Volunteer Labor: People are always available for work in the past tense. % -You've decked the halls with a dozen miles' length of electric lights. -Your front lawn is a gleaming testament of incandescent wonder. The neighbors -wear sunglasses 24/7, and orbiting satellites have officially picked up -and pinpointed your house as the brightest spot on earth. - -You've finally put together the Christmas wonderland of your dreams... now -if only you could get a good picture of it. - -Photographing holiday lights is no easy task. - -- from an email sent by photojojo.com -% -May all your Emus lay soft boiled eggs, and may all your -Kangaroos be born with iPods already fitted. - -- Aussie New Years wish, found on hasselbladinfo.com -% ==== //depot/projects/scottl-camlock/src/games/fortune/datfiles/fortunes-o.real#6 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.32 2009/07/16 20:29:36 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.33 2009/11/07 21:28:21 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -1153,6 +1153,12 @@ "Gabriel's trumpet will produce you from the ass of a pig." -- Al Swearingen, E. B. Farnum, _Deadwood_ % + I'd say that VCS is more like the anal sex of the software +world: Everybody talks about it, some people do it, some people enjoy +it, but typically only vague implications about the best techniques +are ever voiced in public. + -- Warner Losh, on Version Control Systems +% "I'll tell ya, Jeb," Wilbur said to his friend, "the tractor business ain't doin' too well. I ain't sold one all month. "You think you've got problems?" Jeb replied. "The other day, I went ==== //depot/projects/scottl-camlock/src/lib/libc/nls/uk_UA.UTF-8.msg#2 (text+ko) ==== @@ -1,249 +1,259 @@ -$ $FreeBSD: src/lib/libc/nls/uk_UA.UTF-8.msg,v 1.1 2009/03/20 23:55:01 gabor Exp $ -$ -$ Message catalog for uk_UA.UTF-8 locale -$ -$ strerror() support catalog -$ -$set 1 -$ EPERM -1 Операція не дозволена -$ ENOENT -2 Немає такого файлу або каталогу -$ ESRCH -3 Немає такого процесу -$ EINTR -4 Перервано виклик функції -$ EIO -5 Помилка вводу-виводу -$ ENXIO -6 Немає такого пристрою або адреси -$ E2BIG -7 Перелік аргументів надто довгий -$ ENOEXEC -8 Помилка формату виконуваного файлу -$ EBADF -9 Невірний дескриптор файлу -$ ECHILD -10 Немає дочірнього процесу -$ EDEADLK -11 Уникнуто взаємне блокування ресурсів -$ ENOMEM -12 Не достатньо пам'яті -$ EACCES -13 Відмова у доступі -$ EFAULT -14 Невірна адреса -$ ENOTBLK -15 Потрібен блочний пристрій -$ EBUSY -16 Ресурс зайнятий -$ EEXIST -17 Файл вже існує -$ EXDEV -18 Посилання за межі пристрою -$ ENODEV -19 Немає такого пристрою -$ ENOTDIR -20 Це не каталог -$ EISDIR -21 Це каталог -$ EINVAL -22 Недозволений аргумент -$ ENFILE -23 Забагато відкритих файлів у системі -$ EMFILE -24 Забагато відкритих файлів -$ ENOTTY -25 Це не термінал -$ ETXTBSY -26 Текстовий файл зайнятий -$ EFBIG -27 Файл надто великий -$ ENOSPC -28 Не залишилось місця на пристрої -$ ESPIPE -29 Недозволене позиціонування -$ EROFS -30 Файлова система лише для читання -$ EMLINK -31 Забагато посилань -$ EPIPE -32 Канал зруйновано -$ EDOM -33 Помилка області визначення -$ ERANGE -34 Результат надто великий -$ EAGAIN, EWOULDBLOCK -35 Ресурс тимчасово не доступний -$ EINPROGRESS -36 Операція у процесі виконання -$ EALREADY -37 Операція вже виконується -$ ENOTSOCK -38 Це не сокет -$ EDESTADDRREQ -39 Необхідна адреса призначення -$ EMSGSIZE -40 Повідомлення надто довге -$ EPROTOTYPE -41 Помилковий тип протоколу для сокету -$ ENOPROTOOPT -42 Немає такого протоколу -$ EPROTONOSUPPORT -43 Протокол не підтримується -$ ESOCKTNOSUPPORT -44 Цей тип сокету не підтримується -$ EOPNOTSUPP -45 Операція не підтримується -$ EPFNOSUPPORT -46 Родина протоколів не підтримується -$ EAFNOSUPPORT -47 Родина адрес не підтримується протоколом -$ EADDRINUSE -48 Адреса вже використовується -$ EADDRNOTAVAIL -49 Адреса недосяжна -$ ENETDOWN -50 Мережа не працює -$ ENETUNREACH -51 Мережа недосяжна -$ ENETRESET -52 З'єднання припинено мережею -$ ECONNABORTED -53 З'єднання припинено -$ ECONNRESET -54 З'єднання припинено протилежною стороною -$ ENOBUFS -55 Немає вільних буферів -$ EISCONN -56 Сокет вже під'єднано -$ ENOTCONN -57 Сокет не під'єднано -$ ESHUTDOWN -58 Не можу відіслати після закриття сокету протилежною стороною -$ ETOOMANYREFS -59 Забагато посилань: не можу з'єднати -$ ETIMEDOUT -60 Вийшов ліміт часу для з'єднання -$ ECONNREFUSED -61 Відмова у з'єднанні -$ ELOOP -62 Забагато рівнів символічних посилань -$ ENAMETOOLONG -63 Ім'я файлу надто довге -$ EHOSTDOWN -64 Хост не працює -$ EHOSTUNREACH -65 Хост недосяжний -$ ENOTEMPTY -66 Каталог не порожній -$ EPROCLIM -67 Забагато процесів -$ EUSERS -68 Забагато користувачів -$ EDQUOT -69 Перевищена дискова квота -$ ESTALE -70 Застарілий дескриптор файлу NFS -$ EREMOTE -71 Віддалений об'єкт -$ EBADRPC -72 Погана структура RPC -$ ERPCMISMATCH -73 Невірна версія RPC -$ EPROGUNAVAIL -74 Програма RPC недосяжна -$ EPROGMISMATCH -75 Невірна версія програми -$ EPROCUNAVAIL -76 Погана процедура для програми -$ ENOLCK -77 Блокування не доступне -$ ENOSYS -78 Функцію не реалізовано -$ EFTYPE -79 Непридатний тип чи формат файлу -$ EAUTH -80 Помилка аутентифікації -$ ENEEDAUTH -81 Потрібна аутентифікація -$ EIDRM -82 Ідентифікатор вилучено -$ ENOMSG -83 Немає повідомлення бажаного типу -$ EOVERFLOW -84 Завелике значення для цього типу даних -$ ECANCELED -85 Операцію скасовано -$ EILSEQ -86 Недозволена послідовність байтів -$ ENOATTR -87 Атрибут не знайдено -$ EDOOFUS -88 Помилка програмування -$ -$ strsignal() support catalog -$ -$set 2 -$ SIGHUP -1 Відключення -$ SIGINT -2 Переривання -$ SIGQUIT -3 Вихід -$ SIGILL -4 Неприпустима інструкція -$ SIGTRAP -5 Пастка трасування -$ SIGABRT -6 Аварійне завершення -$ SIGEMT -7 Перехоплення емульованої інструкції -$ SIGFPE -8 Помилка роботи з плаваючою крапкою -$ SIGKILL -9 Вбито -$ SIGBUS -10 Помилка шини -$ SIGSEGV -11 Порушення сегментації -$ SIGSYS -12 Поганий системний виклик -$ SIGPIPE -13 Канал зруйновано -$ SIGALRM -14 Таймер вичерпано -$ SIGTERM -15 Завершення -$ SIGURG -16 Невідкладний стан на сокеті -$ SIGSTOP -17 Призупинено (сигнал) -$ SIGTSTP -18 Призупинено -$ SIGCONT -19 Продовження роботи -$ SIGCHLD -20 Зміна статусу дочірнього процесу -$ SIGTTIN -21 Зупинено (ввід з терміналу) -$ SIGTTOU -22 Зупинено (вивід на термінал) -$ SIGIO -23 Ввід-вивід можливий -$ SIGXCPU -24 Перевищено ліміт процесорного часу -$ SIGXFSZ -25 Перевищено ліміт максимального розміру файла -$ SIGVTALRM -26 Віртуальний таймер вичерпано -$ SIGPROF -27 Таймер профілювання вичерпано -$ SIGWINCH -28 Розмір вікна змінено -$ SIGINFO -29 Запит інформації -$ SIGUSR1 -30 Сигнал користувача 1 -$ SIGUSR2 -31 Сигнал користувача 2 +$ $FreeBSD: src/lib/libc/nls/uk_UA.UTF-8.msg,v 1.3 2009/11/08 11:55:03 gabor Exp $ +$ +$ Message catalog for uk_UA.UTF-8 locale +$ +$ strerror() support catalog +$ +$set 1 +$ EPERM +1 Операція не дозволена +$ ENOENT +2 Немає такого файлу або каталогу +$ ESRCH +3 Немає такого процесу +$ EINTR +4 Перервано виклик функції +$ EIO +5 Помилка вводу-виводу +$ ENXIO +6 Немає такого пристрою або адреси +$ E2BIG +7 Перелік аргументів надто довгий +$ ENOEXEC +8 Помилка формату виконуваного файлу +$ EBADF +9 Невірний дескриптор файлу +$ ECHILD +10 Немає дочірнього процесу +$ EDEADLK +11 Уникнуто взаємне блокування ресурсів +$ ENOMEM +12 Не достатньо пам'яті +$ EACCES +13 Відмова у доступі +$ EFAULT +14 Невірна адреса +$ ENOTBLK +15 Потрібен блочний пристрій +$ EBUSY +16 Ресурс зайнятий +$ EEXIST +17 Файл вже існує +$ EXDEV +18 Посилання за межі пристрою +$ ENODEV +19 Немає такого пристрою +$ ENOTDIR +20 Це не каталог +$ EISDIR +21 Це каталог +$ EINVAL +22 Недозволений аргумент +$ ENFILE +23 Забагато відкритих файлів у системі +$ EMFILE +24 Забагато відкритих файлів +$ ENOTTY +25 Це не термінал +$ ETXTBSY +26 Текстовий файл зайнятий +$ EFBIG +27 Файл надто великий +$ ENOSPC +28 Не залишилось місця на пристрої +$ ESPIPE +29 Недозволене позиціонування +$ EROFS +30 Файлова система лише для читання +$ EMLINK +31 Забагато посилань +$ EPIPE +32 Канал зруйновано +$ EDOM +33 Помилка області визначення +$ ERANGE +34 Результат надто великий +$ EAGAIN, EWOULDBLOCK +35 Ресурс тимчасово не доступний +$ EINPROGRESS +36 Операція у процесі виконання +$ EALREADY +37 Операція вже виконується +$ ENOTSOCK +38 Це не сокет +$ EDESTADDRREQ +39 Необхідна адреса призначення +$ EMSGSIZE +40 Повідомлення надто довге +$ EPROTOTYPE +41 Помилковий тип протоколу для сокету +$ ENOPROTOOPT +42 Немає такого протоколу +$ EPROTONOSUPPORT +43 Протокол не підтримується +$ ESOCKTNOSUPPORT +44 Цей тип сокету не підтримується +$ EOPNOTSUPP +45 Операція не підтримується +$ EPFNOSUPPORT +46 Родина протоколів не підтримується +$ EAFNOSUPPORT +47 Родина адрес не підтримується протоколом +$ EADDRINUSE +48 Адреса вже використовується +$ EADDRNOTAVAIL +49 Адреса недосяжна +$ ENETDOWN +50 Мережа не працює +$ ENETUNREACH +51 Мережа недосяжна +$ ENETRESET +52 З'єднання припинено мережею +$ ECONNABORTED +53 З'єднання припинено +$ ECONNRESET +54 З'єднання припинено протилежною стороною +$ ENOBUFS +55 Немає вільних буферів +$ EISCONN +56 Сокет вже під'єднано +$ ENOTCONN +57 Сокет не під'єднано +$ ESHUTDOWN +58 Не можу відіслати після закриття сокету протилежною стороною +$ ETOOMANYREFS +59 Забагато посилань: не можу з'єднати +$ ETIMEDOUT +60 Вийшов ліміт часу для з'єднання +$ ECONNREFUSED +61 Відмова у з'єднанні +$ ELOOP +62 Забагато рівнів символічних посилань +$ ENAMETOOLONG +63 Ім'я файлу надто довге +$ EHOSTDOWN +64 Хост не працює +$ EHOSTUNREACH +65 Хост недосяжний +$ ENOTEMPTY +66 Каталог не порожній +$ EPROCLIM +67 Забагато процесів +$ EUSERS +68 Забагато користувачів +$ EDQUOT +69 Перевищена дискова квота +$ ESTALE +70 Застарілий дескриптор файлу NFS +$ EREMOTE +71 Віддалений об'єкт +$ EBADRPC +72 Погана структура RPC +$ ERPCMISMATCH +73 Невірна версія RPC +$ EPROGUNAVAIL +74 Програма RPC недосяжна +$ EPROGMISMATCH +75 Невірна версія програми +$ EPROCUNAVAIL +76 Погана процедура для програми +$ ENOLCK +77 Блокування не доступне +$ ENOSYS +78 Функцію не реалізовано +$ EFTYPE +79 Непридатний тип чи формат файлу +$ EAUTH +80 Помилка аутентифікації +$ ENEEDAUTH +81 Потрібна аутентифікація +$ EIDRM +82 Ідентифікатор вилучено +$ ENOMSG +83 Немає повідомлення бажаного типу +$ EOVERFLOW +84 Завелике значення для цього типу даних +$ ECANCELED +85 Операцію скасовано +$ EILSEQ +86 Недозволена послідовність байтів +$ ENOATTR +87 Атрибут не знайдено +$ EDOOFUS +88 Помилка програмування +$ EBADMSG +89 Поганий формат повідомлення +$ EMULTIHOP XXX +90 Спроба мултіхопу +$ ENOLINK +91 Мережовий канал розірвано +$ EPROTO +92 Помилка протоколу +$ ENOTCAPABLE +93 Можливості недостатні +$ +$ strsignal() support catalog +$ +$set 2 +$ SIGHUP +1 Відключення +$ SIGINT +2 Переривання +$ SIGQUIT +3 Вихід +$ SIGILL +4 Неприпустима інструкція +$ SIGTRAP +5 Пастка трасування +$ SIGABRT +6 Аварійне завершення +$ SIGEMT +7 Перехоплення емульованої інструкції +$ SIGFPE +8 Помилка роботи з плаваючою крапкою +$ SIGKILL +9 Вбито +$ SIGBUS +10 Помилка шини +$ SIGSEGV +11 Порушення сегментації +$ SIGSYS +12 Поганий системний виклик +$ SIGPIPE +13 Канал зруйновано +$ SIGALRM +14 Таймер вичерпано +$ SIGTERM +15 Завершення +$ SIGURG +16 Невідкладний стан на сокеті +$ SIGSTOP +17 Призупинено (сигнал) +$ SIGTSTP +18 Призупинено +$ SIGCONT +19 Продовження роботи +$ SIGCHLD +20 Зміна статусу дочірнього процесу +$ SIGTTIN +21 Зупинено (ввід з терміналу) +$ SIGTTOU +22 Зупинено (вивід на термінал) +$ SIGIO +23 Ввід-вивід можливий +$ SIGXCPU +24 Перевищено ліміт процесорного часу +$ SIGXFSZ +25 Перевищено ліміт максимального розміру файла +$ SIGVTALRM +26 Віртуальний таймер вичерпано +$ SIGPROF +27 Таймер профілювання вичерпано +$ SIGWINCH +28 Розмір вікна змінено +$ SIGINFO +29 Запит інформації +$ SIGUSR1 +30 Сигнал користувача 1 +$ SIGUSR2 +31 Сигнал користувача 2 ==== //depot/projects/scottl-camlock/src/lib/libc/sys/mmap.2#5 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.59 2009/07/26 06:38:56 alc Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.60 2009/11/06 07:17:31 ed Exp $ .\" -.Dd July 26, 2009 +.Dd November 6, 2009 .Dt MMAP 2 .Os .Sh NAME @@ -108,6 +108,10 @@ argument is ignored. .\".It Dv MAP_FILE .\"Mapped from a regular file or character-special device memory. +.It Dv MAP_ANONYMOUS +This flag is identical to +.Dv MAP_ANON +and is provided for compatibility. .It Dv MAP_FIXED Do not permit the system to select a different address than the one specified. ==== //depot/projects/scottl-camlock/src/lib/libkvm/kvm_i386.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.22 2009/06/14 12:42:06 ed Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.23 2009/11/06 13:10:12 jhb Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -295,9 +295,9 @@ #define PG_FRAME4M (~PAGE4M_MASK) pde_pa = ((u_long)pde & PG_FRAME4M) + (va & PAGE4M_MASK); s = _kvm_pa2off(kd, pde_pa, &ofs); - if (s < sizeof pde) { - _kvm_syserr(kd, kd->program, - "_kvm_vatop: pde_pa not found"); + if (s == 0) { + _kvm_err(kd, kd->program, + "_kvm_vatop: 4MB page address not in dump"); goto invalid; } *pa = ofs; @@ -391,9 +391,9 @@ #define PG_FRAME2M (~PAGE2M_MASK) pde_pa = ((u_long)pde & PG_FRAME2M) + (va & PAGE2M_MASK); s = _kvm_pa2off(kd, pde_pa, &ofs); - if (s < sizeof pde) { - _kvm_syserr(kd, kd->program, - "_kvm_vatop_pae: pde_pa not found"); + if (s == 0) { + _kvm_err(kd, kd->program, + "_kvm_vatop: 2MB page address not in dump"); goto invalid; } *pa = ofs; ==== //depot/projects/scottl-camlock/src/lib/libstand/udp.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.6 2007/01/09 01:02:04 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.7 2009/11/05 06:08:04 marcel Exp $"); #include #include @@ -90,7 +90,7 @@ ip->ip_hl = sizeof(*ip) >> 2; /* half-char */ ip->ip_len = htons(len); ip->ip_p = IPPROTO_UDP; /* char */ - ip->ip_ttl = IP_TTL; /* char */ + ip->ip_ttl = IPDEFTTL; /* char */ ip->ip_src = d->myip; ip->ip_dst = d->destip; ip->ip_sum = in_cksum(ip, sizeof(*ip)); /* short, but special */ ==== //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.24 2009/04/06 11:08:33 luigi Exp $ +# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.25 2009/11/08 08:59:40 luigi Exp $ # # Line starting with #PicoBSD contains PicoBSD build parameters #marker def_sz init MFS_inodes floppy_inodes @@ -11,11 +11,14 @@ # values accessible through getenv() # env "PICOBSD.env" -cpu I486_CPU +#cpu I486_CPU cpu I586_CPU cpu I686_CPU ident PICOBSD +options SMP +device apic + options SCHED_4BSD # mandatory to have one scheduler #options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking ==== //depot/projects/scottl-camlock/src/share/examples/ses/srcs/chpmon.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.1 2000/02/29 05:44:16 mjacob Exp $ */ +/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.2 2009/11/04 23:36:23 delphij Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -47,9 +47,7 @@ #define BADSTAT \ (SES_ENCSTAT_UNRECOV|SES_ENCSTAT_CRITICAL|SES_ENCSTAT_NONCRITICAL) int -main(a, v) - int a; - char **v; +main(int a, char **v) { int fd, delay, dev; ses_encstat stat, *carray; ==== //depot/projects/scottl-camlock/src/share/examples/ses/srcs/eltsub.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/share/examples/ses/srcs/eltsub.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */ +/* $FreeBSD: src/share/examples/ses/srcs/eltsub.c,v 1.2 2009/11/04 23:36:23 delphij Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -38,9 +38,10 @@ #include #include SESINC +#include "eltsub.h" + char * -geteltnm(type) - int type; +geteltnm(int type) { static char rbuf[132]; @@ -116,8 +117,7 @@ } static char * -scode2ascii(code) - u_char code; +scode2ascii(u_char code) { static char rbuf[32]; switch (code & 0xf) { @@ -154,9 +154,7 @@ char * -stat2ascii(eletype, cstat) - int eletype; - u_char *cstat; +stat2ascii(int eletype __unused, u_char *cstat) { static char ebuf[256], *scode; ==== //depot/projects/scottl-camlock/src/share/examples/ses/srcs/getencstat.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 8 14:37:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 548BB1065694; Sun, 8 Nov 2009 14:37: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 F317E1065676 for ; Sun, 8 Nov 2009 14:37:22 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E07178FC17 for ; Sun, 8 Nov 2009 14:37:22 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8EbMsg004934 for ; Sun, 8 Nov 2009 14:37:22 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8EbMvb004932 for perforce@freebsd.org; Sun, 8 Nov 2009 14:37:22 GMT (envelope-from mav@freebsd.org) Date: Sun, 8 Nov 2009 14:37:22 GMT Message-Id: <200911081437.nA8EbMvb004932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 14:37:23 -0000 http://p4web.freebsd.org/chv.cgi?CH=170361 Change 170361 by mav@mav_mavbook on 2009/11/08 14:36:52 IFC Affected files ... .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#40 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#35 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#17 integrate Differences ... ==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#40 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1560 2009/10/29 09:51:13 ru Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1561 2009/11/08 14:33:19 mav Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1715,8 +1715,11 @@ # # ATA_STATIC_ID: controller numbering is static ie depends on location # else the device numbers are dynamically allocated. +# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request +# before timing out. options ATA_STATIC_ID +#options ATA_REQUEST_TIMEOUT=10 # # Standard floppy disk controllers and floppy tapes, supports ==== //depot/projects/scottl-camlock/src/sys/conf/options#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.693 2009/10/21 12:47:09 stas Exp $ +# $FreeBSD: src/sys/conf/options,v 1.694 2009/11/08 14:33:19 mav Exp $ # # On the handling of kernel options # @@ -350,6 +350,7 @@ # Options used in the 'ata' ATA/ATAPI driver ATA_STATIC_ID opt_ata.h ATA_NOPCI opt_ata.h +ATA_REQUEST_TIMEOUT opt_ata.h ATA_CAM opt_ata.h # Net stuff. ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#23 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.148 2009/10/31 13:24:14 mav Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.149 2009/11/08 14:33:19 mav Exp $ */ #if 0 @@ -345,6 +345,10 @@ #define ATA_OP_FINISHED 1 #define ATA_MAX_28BIT_LBA 268435455UL +#ifndef ATA_REQUEST_TIMEOUT +#define ATA_REQUEST_TIMEOUT 10 +#endif + /* structure used for composite atomic operations */ #define MAX_COMPOSITES 32 /* u_int32_t bits */ struct ata_composite { ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.218 2009/10/26 11:20:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.219 2009/11/08 14:33:19 mav Exp $"); #include "opt_ata.h" #include @@ -230,7 +230,7 @@ } request->dev = dev; request->flags = ATA_R_CONTROL; - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 1; request->callback = ad_power_callback; request->u.ata.command = ATA_STANDBY_IMMEDIATE; @@ -262,10 +262,10 @@ if (atadev->spindown_state) { device_printf(dev, "request while spun down, starting.\n"); atadev->spindown_state = 0; - request->timeout = 31; + request->timeout = MAX(ATA_REQUEST_TIMEOUT, 31); } else { - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; } request->retries = 2; request->data = bp->bio_data; @@ -468,7 +468,7 @@ request->u.ata.count = 0; request->u.ata.feature = 0; request->flags = ATA_R_CONTROL | ATA_R_QUIET; - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 0; ata_queue_request(request); if (request->status & ATA_S_ERROR) @@ -487,7 +487,7 @@ request->u.ata.count = 1; request->u.ata.feature = 0; request->flags = ATA_R_CONTROL; - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 0; ata_queue_request(request); if (request->status & ATA_S_ERROR) ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-queue.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.88 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.89 2009/11/08 14:33:19 mav Exp $"); #include "opt_ata.h" #include @@ -141,9 +141,9 @@ if (atadev->spindown_state) { device_printf(dev, "request while spun down, starting.\n"); atadev->spindown_state = 0; - request->timeout = 31; + request->timeout = MAX(ATA_REQUEST_TIMEOUT, 31); } else { - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; } request->retries = 0; ata_queue_request(request); @@ -397,7 +397,7 @@ request->bytecount = sizeof(struct atapi_sense); request->donecount = 0; request->transfersize = sizeof(struct atapi_sense); - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; request->flags &= (ATA_R_ATAPI | ATA_R_QUIET | ATA_R_DEBUG); request->flags |= (ATA_R_READ | ATA_R_AT_HEAD | ATA_R_REQUEUE); ATA_DEBUG_RQ(request, "autoissue request sense"); ==== //depot/projects/scottl-camlock/src/sys/dev/ata/ata-raid.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.136 2009/10/26 11:20:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.137 2009/11/08 14:33:19 mav Exp $"); #include "opt_ata.h" #include @@ -273,7 +273,7 @@ request->u.ata.lba = 0; request->u.ata.count = 0; request->u.ata.feature = 0; - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 0; request->flags |= ATA_R_ORDERED | ATA_R_DIRECT; ata_queue_request(request); @@ -4371,7 +4371,7 @@ return NULL; } request->dev = dev; - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 2; request->callback = ata_raid_done; request->driver = rdp; @@ -4445,7 +4445,7 @@ /* setup request */ request->dev = dev; - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; request->retries = 0; request->data = data; request->bytecount = bcount; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.209 2009/10/27 17:12:59 jh Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.210 2009/11/08 14:33:19 mav Exp $"); #include "opt_ata.h" #include @@ -700,7 +700,7 @@ request->dev = dev; bcopy(ccb, request->u.atapi.ccb, 16); request->flags = ATA_R_ATAPI; - request->timeout = 10; + request->timeout = ATA_REQUEST_TIMEOUT; ata_queue_request(request); if (!request->error && (request->u.atapi.sense.key == 2 || From owner-p4-projects@FreeBSD.ORG Sun Nov 8 16:18:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F6B21065676; Sun, 8 Nov 2009 16:18:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 140211065672 for ; Sun, 8 Nov 2009 16:18:04 +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 01A5D8FC08 for ; Sun, 8 Nov 2009 16:18:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8GI35Z014142 for ; Sun, 8 Nov 2009 16:18:03 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8GI3aU014140 for perforce@freebsd.org; Sun, 8 Nov 2009 16:18:03 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 8 Nov 2009 16:18:03 GMT Message-Id: <200911081618.nA8GI3aU014140@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 Precedence: bulk Cc: Subject: PERFORCE change 170365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 16:18:04 -0000 http://p4web.freebsd.org/chv.cgi?CH=170365 Change 170365 by rene@rene_self on 2009/11/08 16:17:07 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#20 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#12 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#22 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -768,20 +768,20 @@ - VMWare on MacOS + VMware on MacOS - VMWare Fusion for &mac; is a + VMware Fusion for &mac; is a commercial software product available for &intel; based &apple; &mac; computers running &macos; 10.4.9 or higher. FreeBSD is a fully supported guest operating system. Once - VMWare Fusion has been installed on + VMware Fusion has been installed on &macos; X, the user must configure a virtual machine and then install the desired guest operating system. - Installing FreeBSD on VMWare/&macos; X + Installing FreeBSD on VMware/&macos; X - The first step is to start VMWare Fusion, the Virtual + The first step is to start VMware Fusion, the Virtual Machine Library will load. Click "New" to create the VM: @@ -906,10 +906,10 @@ - Configuring FreeBSD on &macos; X/VMWare + Configuring FreeBSD on &macos; X/VMware After FreeBSD has been successfully installed on &macos; - X with VMWare, there are a number + X with VMware, there are a number of configuration steps that can be taken to optimize the system for virtualized operation. @@ -919,14 +919,14 @@ The most important step is to reduce the tunable to reduce the CPU utilization - of FreeBSD under the VMWare + of FreeBSD under the VMware environment. This is accomplished by adding the following line to /boot/loader.conf: kern.hz=100 Without this setting, an idle FreeBSD - VMWare guest + VMware guest OS will use roughly 15% of the CPU of a single processor &imac;. After this change the usage will be closer to a mere 5%. @@ -936,7 +936,7 @@ Create a new kernel configuration file You can remove all of the FireWire, and USB device - drivers. VMWare provides a + drivers. VMware provides a virtual network adapter used by the &man.em.4; driver, so all other network devices except for &man.em.4; can be removed from the kernel. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/x11/chapter.sgml#20 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_nl/www/nl/where.sgml#12 (text+ko) ==== @@ -1,5 +1,5 @@ + ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#22 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.77 2009/10/21 07:40:38 brueffer Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.78 2009/11/08 14:27:01 brueffer Exp $ @@ -113,7 +113,7 @@ BSDCan 2010 - http://www.bsdcan.org/ + http://www.bsdcan.org/2010/ 2010 5 From owner-p4-projects@FreeBSD.ORG Sun Nov 8 16:23:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E4081065695; Sun, 8 Nov 2009 16:23:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A703106568D for ; Sun, 8 Nov 2009 16:23:09 +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 389828FC16 for ; Sun, 8 Nov 2009 16:23:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8GN95l014517 for ; Sun, 8 Nov 2009 16:23:09 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8GN94j014515 for perforce@freebsd.org; Sun, 8 Nov 2009 16:23:09 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 8 Nov 2009 16:23:09 GMT Message-Id: <200911081623.nA8GN94j014515@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 Precedence: bulk Cc: Subject: PERFORCE change 170366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 16:23:09 -0000 http://p4web.freebsd.org/chv.cgi?CH=170366 Change 170366 by rene@rene_self on 2009/11/08 16:22:25 MFen handbook/virtualization 1.20 -> 1.21 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#13 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#13 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.6 2009/09/02 18:39:54 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml - %SRCID% 1.20 + %SRCID% 1.21 --> @@ -795,21 +795,21 @@ - VMWare op &macos; + VMware op &macos; - VMWare Fusion voor &mac; is een + VMware Fusion voor &mac; is een comercieel softwareprodukt beschikbaar voor op &intel; gebaseeerde &mac;-computers die &macos; 10.4.9 of nieuwer draaien. &os; is een volledig ondersteund - gast-besturingssysteem. Nadat VMWare Fusion + gast-besturingssysteem. Nadat VMware Fusion is geïnstalleerd op &macos; X dient de gebruiker een virtuele machine in te stellen en daarna het gewenste gast-besturingssysteem te installeren. - &os; installeren op VMWare/&macos; X + &os; installeren op VMware/&macos; X - De eerste stap is om VMWare Fusion te laden, de Virtual + De eerste stap is om VMware Fusion te laden, de Virtual Machine Library zal geladen worden. Klik op "New" om de VM aan te maken: @@ -938,10 +938,10 @@ - &os; instellen op &macos; X/VMWare + &os; instellen op &macos; X/VMware Nadat &os; succesvol is geïnstalleerd op &macos; X - met VMWare, zijn er een aantal + met VMware, zijn er een aantal instellingen die gewijzigd kunnen worden op het systeem te optimaliseren voor virtueel gebruik. @@ -951,7 +951,7 @@ De belangrijkste stap is het verlagen van de tunable om het CPU-gebruik van - &os; in de omgeving van VMWare + &os; in de omgeving van VMware te verminderen. Dit kan bereikt worden door de volgende regel aan /boot/loader.conf toe te voegen: @@ -959,7 +959,7 @@ kern.hz=100 Zonder deze instelling gebruikt &os; als - VMWare gast-besturingssysteem ongeveer 15% + VMware gast-besturingssysteem ongeveer 15% van de CPU van een enkele &imac;-processor. Na deze verandering zal het gebruik dichter bij 5% liggen. @@ -969,7 +969,7 @@ Alle stuurprogramma's voor FireWire en USB kunnen - verwijderd worden. VMWare + verwijderd worden. VMware biedt een virtuele netwerkadapter dat door het stuurpogramma &man.em.4; gebruikt wordt, dus alle netwerkapparaten behalve &man.em.4; kunnen uit de kernel From owner-p4-projects@FreeBSD.ORG Sun Nov 8 16:32:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E23A71065670; Sun, 8 Nov 2009 16:32:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6956106566B for ; Sun, 8 Nov 2009 16:32:18 +0000 (UTC) (envelope-from truncs@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7ADF48FC1B for ; Sun, 8 Nov 2009 16:32:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8GWIch015192 for ; Sun, 8 Nov 2009 16:32:18 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8GWIoT015190 for perforce@freebsd.org; Sun, 8 Nov 2009 16:32:18 GMT (envelope-from truncs@FreeBSD.org) Date: Sun, 8 Nov 2009 16:32:18 GMT Message-Id: <200911081632.nA8GWIoT015190@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to truncs@FreeBSD.org using -f From: Aditya Sarawgi To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 16:32:19 -0000 http://p4web.freebsd.org/chv.cgi?CH=170367 Change 170367 by truncs@aditya on 2009/11/08 16:32:10 - Fix typos - Use correct #endif comments Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#5 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dinode.h#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dir.h#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#6 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_bmap.c#5 (text+ko) ==== @@ -51,7 +51,7 @@ #include /* - * Bmap converts a the logical block number of a file to its physical block + * Bmap converts the logical block number of a file to its physical block * number on the disk. The conversion is done by using the logical block * number to index into the array of block pointers described by the dinode. */ ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dinode.h#3 (text+ko) ==== @@ -74,5 +74,5 @@ u_int32_t e2di_linux_reserved3; /* 124 */ }; -#endif /* _SYS_GNU_EXT2FS_EXT2_DINODE_H_ */ +#endif /* _FS_EXT2FS_EXT2_DINODE_H_ */ ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_dir.h#3 (text+ko) ==== @@ -77,5 +77,5 @@ #define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) #define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ ~EXT2_DIR_ROUND) -#endif /* !_SYS_GNU_EXT2FS_EXT2_DIR_H_ */ +#endif /* !_FS_EXT2FS_EXT2_DIR_H_ */ ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/ext2_extern.h#4 (text+ko) ==== @@ -90,4 +90,4 @@ extern struct vop_vector ext2_vnodeops; extern struct vop_vector ext2_fifoops; -#endif /* !_SYS_GNU_EXT2FS_EXT2_EXTERN_H_ */ +#endif /* !_FS_EXT2FS_EXT2_EXTERN_H_ */ ==== //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ext2fs/inode.h#6 (text+ko) ==== @@ -167,4 +167,4 @@ }; #endif /* _KERNEL */ -#endif /* !_SYS_GNU_EXT2FS_INODE_H_ */ +#endif /* !_FS_EXT2FS_INODE_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Nov 8 19:11:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A99671065672; Sun, 8 Nov 2009 19:11: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 6DF71106566B for ; Sun, 8 Nov 2009 19:11:59 +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 5BAF18FC1B for ; Sun, 8 Nov 2009 19:11:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8JBxqJ039812 for ; Sun, 8 Nov 2009 19:11:59 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8JBx7S039810 for perforce@freebsd.org; Sun, 8 Nov 2009 19:11:59 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 8 Nov 2009 19:11:59 GMT Message-Id: <200911081911.nA8JBx7S039810@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 19:11:59 -0000 http://p4web.freebsd.org/chv.cgi?CH=170372 Change 170372 by pgj@beehive on 2009/11/08 19:11:37 IFC Affected files ... .. //depot/projects/docproj_hu/www/en/internal/i18n.sgml#3 integrate .. //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#12 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#22 integrate Differences ... ==== //depot/projects/docproj_hu/www/en/internal/i18n.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -11,31 +11,31 @@

Policy

When listing countries or other geographic areas in - documentation, menus, mirror/FTP lists, or other contexts, it is - important to introduce such lists as "Countries or Regions" so that - an implied sovereignty claim is neither made nor denied to those - regions which have their own top level domains.

+ documentation, menus, mirror/FTP lists, or other contexts, it is + important to introduce such lists as "Countries or Regions" so that + an implied sovereignty claim is neither made nor denied to those + regions which have their own top level domains.

The ISO 3166 country codes do not necessarily refer to - nation-states (e.g. Hong Kong) and should not be treated as such. - Likewise the "official" ISO 3166 short english names for those - countries and regions which have top level domains are in some cases - controversial, and not all of them are commonly used in the software - industry.

+ nation-states (e.g. Hong Kong) and should not be treated as such. + Likewise the "official" ISO 3166 short English names for those + countries and regions which have top level domains are in some cases + controversial, and not all of them are commonly used in the software + industry.

We follow the guidelines used by IBM, Microsoft, Google, and - other prominent software companies in their documentation in that - Taiwan should never be included with a distinction referring to the - Republic of China, People's Republic of China, or a national flag. - Interpretation of the word "Taiwan" is in the eye of the beholder, - and The FreeBSD Project does not endorse any particular position.

+ other prominent software companies in their documentation in that + Taiwan should never be included with a distinction referring to the + Republic of China, People's Republic of China, or a national flag. + Interpretation of the word "Taiwan" is in the eye of the beholder, + and The FreeBSD Project does not endorse any particular position.

Reference:

-
    -
  1. IBM -Localization guidelines
    2. -
+ +
    +
  1. IBM + Localization guidelines
    2. +
&footer; ==== //depot/projects/docproj_hu/www/hu/platforms/arm.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ - + ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#22 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.77 2009/10/21 07:40:38 brueffer Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.78 2009/11/08 14:27:01 brueffer Exp $ @@ -113,7 +113,7 @@ BSDCan 2010 - http://www.bsdcan.org/ + http://www.bsdcan.org/2010/ 2010 5 From owner-p4-projects@FreeBSD.ORG Sun Nov 8 19:28:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 710C410656A7; Sun, 8 Nov 2009 19:28: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 343A01065697 for ; Sun, 8 Nov 2009 19:28:16 +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 08EB48FC29 for ; Sun, 8 Nov 2009 19:28:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8JSFCh040925 for ; Sun, 8 Nov 2009 19:28:15 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8JSFvt040923 for perforce@freebsd.org; Sun, 8 Nov 2009 19:28:15 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 8 Nov 2009 19:28:15 GMT Message-Id: <200911081928.nA8JSFvt040923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170373 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2009 19:28:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=170373 Change 170373 by pgj@beehive on 2009/11/08 19:27:24 MFen (doc): 1.467 -> 1.468 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml 1.195 -> 1.196 hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#34 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#18 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#34 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.467 + %SRCID% 1.468 --> @@ -3078,6 +3078,16 @@ + RELENG_8_0 + + + A FreeBSD-8.0 kiadás ága, ahová + csak a biztonsági frissítések és + a kritikus hibajavítások kerülnek. + + + + RELENG_7 ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#18 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -2055,9 +2055,14 @@ /etc/rc.conf állományba beírjuk a gdm_enable="YES" sort. Újraindítás után a - GNOME automatikusan elindul - bejelentkezéskor — nincs szükség - további beállításra. + GDM automatikusan elindul. + + Ha a GDM mellett az összes + GNOME szolgáltatást + is el akarjuk indítani, vegyük fel a + gnome_enable="YES" sort az + /etc/rc.conf + állományba. A GNOME-ot parancssorból is elindíthatjuk, ha hozzá megfelelõen From owner-p4-projects@FreeBSD.ORG Mon Nov 9 16:43:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69B2A1065694; Mon, 9 Nov 2009 16:43: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 15657106568D for ; Mon, 9 Nov 2009 16:43:33 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 029638FC1C for ; Mon, 9 Nov 2009 16:43:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9GhWVx006567 for ; Mon, 9 Nov 2009 16:43:32 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA9GhWXE006565 for perforce@freebsd.org; Mon, 9 Nov 2009 16:43:32 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 9 Nov 2009 16:43:32 GMT Message-Id: <200911091643.nA9GhWXE006565@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 16:43:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=170404 Change 170404 by jona@jona-capsicum-kent on 2009/11/09 16:42:44 cap_main and _capstart for both i386 and amd64 Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#3 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#3 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ #endif /* lint */ #include +#include #include "libc_private.h" #include "crtbrand.c" @@ -95,6 +96,45 @@ } + +/* The Capsicum entry function. */ +void +_capstart(char **ap, void (*cleanup)(void)) +{ + int argc; + char **argv; + char **env; + const char *s; + + argc = *(long *)(void *)ap; + argv = ap + 1; + env = ap + 2 + argc; + environ = env; + if (argc > 0 && argv[0] != NULL) { + __progname = argv[0]; + for (s = __progname; *s != '\0'; s++) + if (*s == '/') + __progname = s + 1; + } + + if (&_DYNAMIC != NULL) + atexit(cleanup); + else + _init_tls(); + +#ifdef GCRT + atexit(_mcleanup); +#endif + atexit(_fini); +#ifdef GCRT +/* monstartup(&eprol, &etext);*/ +/*__asm__("eprol:");*/ /* JA hope and pray... */ +#endif + _init(); + exit( cap_main(argc, argv, env) ); +} + + /* The Capsicum entry function. */ void _capstart(char **ap, void (*cleanup)(void)) ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#4 (text+ko) ==== @@ -52,10 +52,25 @@ __FreeBSD_version }; + + int cap_main(int argc, char **argv, char **env) { const char warning[] = - "ERROR: attempting to run a regular binary in capability mode.\n\nIf you wish to run a binary in a sandbox, you must provide a cap_main() function which takes the same arguments as main().\n"; + "ERROR: attempting to run a regular binary in capability mode!\n\nIf you want to run a binary in a sandbox, you must provide a cap_main() function, which takes the same arguments as main().\n"; + + write(2, warning, sizeof(warning)); +} + + +int cap_main(int argc, char **argv, char **env) +{ + const char warning[] = + "ERROR: attempting to run a regular binary in capability mode." + "\n\n" + "If you wish to run a binary in a sandbox, you must provide a " + "cap_main() function which takes the same arguments as main()." + "\n"; write(2, warning, sizeof(warning)); return 1; ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#3 (text+ko) ==== @@ -148,6 +148,51 @@ #endif atexit(_fini); #ifdef GCRT + monstartup(&eprol, &etext); +__asm__("eprol:"); +#endif + _init(); + exit( cap_main(argc, argv, env) ); +} + + + + +/* The Capsicum entry function. */ +void +_capstart(char *ap, ...) +{ + fptr cleanup; + int argc; + char **argv; + char **env; + const char *s; + +#ifdef __GNUC__ + __asm__("and $0xfffffff0,%esp"); +#endif + cleanup = get_rtld_cleanup(); + argv = ≈ + argc = *(long *)(void *)(argv - 1); + env = argv + argc + 1; + environ = env; + if (argc > 0 && argv[0] != NULL) { + __progname = argv[0]; + for (s = __progname; *s != '\0'; s++) + if (*s == '/') + __progname = s + 1; + } + + if (&_DYNAMIC != NULL) + atexit(cleanup); + else + _init_tls(); + +#ifdef GCRT + atexit(_mcleanup); +#endif + atexit(_fini); +#ifdef GCRT /* monstartup(&eprol, &etext); __asm__("eprol:");*/ /* XXX: does this interfere with profiling? */ #endif From owner-p4-projects@FreeBSD.ORG Mon Nov 9 16:47:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3E3A10656A5; Mon, 9 Nov 2009 16:47:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4FCA81065697 for ; Mon, 9 Nov 2009 16:47:37 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 331818FC20 for ; Mon, 9 Nov 2009 16:47:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9GlbMi017191 for ; Mon, 9 Nov 2009 16:47:37 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA9Glbu3017189 for perforce@freebsd.org; Mon, 9 Nov 2009 16:47:37 GMT (envelope-from jona@FreeBSD.org) Date: Mon, 9 Nov 2009 16:47:37 GMT Message-Id: <200911091647.nA9Glbu3017189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 16:47:38 -0000 http://p4web.freebsd.org/chv.cgi?CH=170405 Change 170405 by jona@jona-capsicum-kent on 2009/11/09 16:47:10 Removed the multiple definitions which snuck in here Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#4 (text+ko) ==== @@ -134,42 +134,4 @@ exit( cap_main(argc, argv, env) ); } - -/* The Capsicum entry function. */ -void -_capstart(char **ap, void (*cleanup)(void)) -{ - int argc; - char **argv; - char **env; - const char *s; - - argc = *(long *)(void *)ap; - argv = ap + 1; - env = ap + 2 + argc; - environ = env; - if (argc > 0 && argv[0] != NULL) { - __progname = argv[0]; - for (s = __progname; *s != '\0'; s++) - if (*s == '/') - __progname = s + 1; - } - - if (&_DYNAMIC != NULL) - atexit(cleanup); - else - _init_tls(); - -#ifdef GCRT - atexit(_mcleanup); -#endif - atexit(_fini); -#ifdef GCRT -/* monstartup(&eprol, &etext); -__asm__("eprol:");*/ /* XXX: does this interfere with profiling? */ -#endif - _init(); - exit( cap_main(argc, argv, env) ); -} - __asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\""); ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#5 (text+ko) ==== @@ -62,17 +62,3 @@ write(2, warning, sizeof(warning)); } - -int cap_main(int argc, char **argv, char **env) -{ - const char warning[] = - "ERROR: attempting to run a regular binary in capability mode." - "\n\n" - "If you wish to run a binary in a sandbox, you must provide a " - "cap_main() function which takes the same arguments as main()." - "\n"; - - write(2, warning, sizeof(warning)); - return 1; -} - ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#4 (text+ko) ==== @@ -155,49 +155,4 @@ exit( cap_main(argc, argv, env) ); } - - - -/* The Capsicum entry function. */ -void -_capstart(char *ap, ...) -{ - fptr cleanup; - int argc; - char **argv; - char **env; - const char *s; - -#ifdef __GNUC__ - __asm__("and $0xfffffff0,%esp"); -#endif - cleanup = get_rtld_cleanup(); - argv = ≈ - argc = *(long *)(void *)(argv - 1); - env = argv + argc + 1; - environ = env; - if (argc > 0 && argv[0] != NULL) { - __progname = argv[0]; - for (s = __progname; *s != '\0'; s++) - if (*s == '/') - __progname = s + 1; - } - - if (&_DYNAMIC != NULL) - atexit(cleanup); - else - _init_tls(); - -#ifdef GCRT - atexit(_mcleanup); -#endif - atexit(_fini); -#ifdef GCRT -/* monstartup(&eprol, &etext); -__asm__("eprol:");*/ /* XXX: does this interfere with profiling? */ -#endif - _init(); - exit( cap_main(argc, argv, env) ); -} - __asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.15 2005/10/07 22:13:17 bde Exp $\""); From owner-p4-projects@FreeBSD.ORG Mon Nov 9 16:48:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A925C1065692; Mon, 9 Nov 2009 16:48: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 6D8821065679 for ; Mon, 9 Nov 2009 16:48:38 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AA758FC0A for ; Mon, 9 Nov 2009 16:48:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9GmcUs017253 for ; Mon, 9 Nov 2009 16:48:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA9Gmc3B017251 for perforce@freebsd.org; Mon, 9 Nov 2009 16:48:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 9 Nov 2009 16:48:38 GMT Message-Id: <200911091648.nA9Gmc3B017251@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 16:48:38 -0000 http://p4web.freebsd.org/chv.cgi?CH=170406 Change 170406 by hselasky@hselasky_laptop001 on 2009/11/09 16:47:48 USB CORE: - Improve High Speed slot allocation mechanism. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#42 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#42 (text+ko) ==== @@ -2356,19 +2356,21 @@ /* Allocate a microframe slot first: */ - slot = usb_intr_schedule_adjust - (xfer->xroot->udev, xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX); + slot = usb_intr_schedule_adjust(xfer->xroot->udev, + xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, 0x01); if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { xfer->usb_uframe = slot; - xfer->usb_smask = (1 << slot) & 0xFF; - xfer->usb_cmask = 0; + xfer->usb_smask = (0x01 << slot) & 0xFF; + xfer->usb_cmask = 0x00; } else { xfer->usb_uframe = slot; - xfer->usb_smask = (1 << slot) & 0x3F; - xfer->usb_cmask = (-(4 << slot)) & 0xFE; + xfer->usb_smask = (0x01 << slot) & 0x3F; + xfer->usb_cmask = (-(0x04 << slot)) & 0xFE; } + DPRINTFN(11, "slot=%d\n", slot); + /* * Find the best QH position corresponding to the given interval: */ @@ -2403,8 +2405,10 @@ { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + /* Free microframe slot: */ + usb_intr_schedule_adjust(xfer->xroot->udev, - -(xfer->max_frame_size), xfer->usb_uframe); + -xfer->max_frame_size, xfer->usb_uframe, 0x01); sc->sc_intr_stat[xfer->qh_pos]--; @@ -2731,28 +2735,34 @@ uint32_t temp; uint8_t ds; uint8_t slot; - - slot = usb_intr_schedule_adjust(xfer->xroot->udev, xfer->max_frame_size, - USB_HS_MICRO_FRAMES_MAX); - - xfer->usb_uframe = slot; - xfer->usb_cmask = 0; + uint8_t mask; switch (usbd_xfer_get_fps_shift(xfer)) { case 0: - xfer->usb_smask = 0xFF; + mask = 0xFF; break; case 1: - xfer->usb_smask = 0x55 << (slot & 1); + mask = 0x55; break; case 2: - xfer->usb_smask = 0x11 << (slot & 3); + mask = 0x11; break; default: - xfer->usb_smask = 0x01 << (slot & 7); + mask = 0x01; break; } + /* Allocate a microframe multi-slot first: */ + + slot = usb_intr_schedule_adjust(xfer->xroot->udev, + xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, mask); + + xfer->usb_uframe = slot; + xfer->usb_cmask = 0; + xfer->usb_smask = mask << slot; + + DPRINTFN(11, "slot=%d, mask=0x%02x\n", slot, mask); + /* initialize all TD's */ for (ds = 0; ds != 2; ds++) { @@ -2796,8 +2806,11 @@ ehci_device_isoc_hs_close(struct usb_xfer *xfer) { + /* Free microframe multi-slot: */ + usb_intr_schedule_adjust(xfer->xroot->udev, - -(xfer->max_frame_size), xfer->usb_uframe); + -xfer->max_frame_size, xfer->usb_uframe, + xfer->usb_smask >> xfer->usb_uframe); ehci_device_done(xfer, USB_ERR_CANCELLED); } ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#36 (text+ko) ==== @@ -1108,21 +1108,38 @@ * The best Transaction Translation slot for an interrupt endpoint. *------------------------------------------------------------------------*/ static uint8_t -usb_intr_find_best_slot(usb_size_t *ptr, uint8_t start, uint8_t end) +usb_intr_find_best_slot(usb_size_t *ptr, uint8_t start, + uint8_t end, uint8_t mask) { - usb_size_t max = 0 - 1; + usb_size_t min = 0 - 1; + usb_size_t sum; uint8_t x; uint8_t y; + uint8_t z; y = 0; /* find the last slot with lesser used bandwidth */ for (x = start; x < end; x++) { - if (max >= ptr[x]) { - max = ptr[x]; + + sum = 0; + + /* compute sum of bandwidth */ + for (z = x; z < end; z++) { + if (mask & (1U << (z - x))) + sum += ptr[z]; + } + + /* check if the current multi-slot is more optimal */ + if (min >= sum) { + min = sum; y = x; } + + /* check if the mask is about to be shifted out */ + if (mask & (1U << (end - 1 - x))) + break; } return (y); } @@ -1134,17 +1151,19 @@ * having index "slot" by "len" bytes. "len" can be negative. If the * "slot" argument is greater or equal to "USB_HS_MICRO_FRAMES_MAX" * the "slot" argument will be replaced by the slot having least used - * bandwidth. + * bandwidth. The "mask" argument is used for multi-slot allocations. * * Returns: - * The slot on which the bandwidth update was done. + * The slot in which the bandwidth update was done: 0..7 *------------------------------------------------------------------------*/ uint8_t -usb_intr_schedule_adjust(struct usb_device *udev, int16_t len, uint8_t slot) +usb_intr_schedule_adjust(struct usb_device *udev, int16_t len, + uint8_t slot, uint8_t mask) { struct usb_bus *bus = udev->bus; struct usb_hub *hub; enum usb_dev_speed speed; + uint8_t x; USB_BUS_LOCK_ASSERT(bus, MA_OWNED); @@ -1166,17 +1185,25 @@ hub = udev->parent_hs_hub->hub; if (slot >= USB_HS_MICRO_FRAMES_MAX) { slot = usb_intr_find_best_slot(hub->uframe_usage, - USB_FS_ISOC_UFRAME_MAX, 6); + USB_FS_ISOC_UFRAME_MAX, 6, mask); + } + for (x = slot; x < 8; x++) { + if (mask & (1U << (x - slot))) { + hub->uframe_usage[x] += len; + bus->uframe_usage[x] += len; + } } - hub->uframe_usage[slot] += len; - bus->uframe_usage[slot] += len; break; default: if (slot >= USB_HS_MICRO_FRAMES_MAX) { slot = usb_intr_find_best_slot(bus->uframe_usage, 0, - USB_HS_MICRO_FRAMES_MAX); + USB_HS_MICRO_FRAMES_MAX, mask); + } + for (x = slot; x < 8; x++) { + if (mask & (1U << (x - slot))) { + bus->uframe_usage[x] += len; + } } - bus->uframe_usage[slot] += len; break; } return (slot); ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#14 (text+ko) ==== @@ -67,7 +67,7 @@ /* function prototypes */ uint8_t usb_intr_schedule_adjust(struct usb_device *udev, int16_t len, - uint8_t slot); + uint8_t slot, uint8_t mask); void usbd_fs_isoc_schedule_init_all(struct usb_fs_isoc_schedule *fss); void usb_bus_port_set_device(struct usb_bus *bus, struct usb_port *up, struct usb_device *udev, uint8_t device_index); From owner-p4-projects@FreeBSD.ORG Mon Nov 9 18:31:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAB2B1065694; Mon, 9 Nov 2009 18:31: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 6F494106568D for ; Mon, 9 Nov 2009 18:31:21 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 432B88FC20 for ; Mon, 9 Nov 2009 18:31:21 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9IVL86026701 for ; Mon, 9 Nov 2009 18:31:21 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA9IVLRQ026699 for perforce@freebsd.org; Mon, 9 Nov 2009 18:31:21 GMT (envelope-from mav@freebsd.org) Date: Mon, 9 Nov 2009 18:31:21 GMT Message-Id: <200911091831.nA9IVLRQ026699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 18:31:21 -0000 http://p4web.freebsd.org/chv.cgi?CH=170409 Change 170409 by mav@mav_mavtest on 2009/11/09 18:30:51 Organize device IDs and add some more of them. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#16 edit .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#4 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#16 (text+ko) ==== @@ -89,24 +89,37 @@ MALLOC_DEFINE(M_SIIS, "SIIS driver", "SIIS driver data buffers"); +static struct { + uint32_t id; + const char *name; + int ports; +} siis_ids[] = { + {0x31241095, "SiI3124", 4}, + {0x31248086, "SiI3124", 4}, + {0x31321095, "SiI3132", 2}, + {0x02421095, "SiI3132", 2}, + {0x02441095, "SiI3132", 2}, + {0x31311095, "SiI3131", 1}, + {0x35311095, "SiI3531", 1}, + {0, NULL, 0} +}; + static int siis_probe(device_t dev) { + char buf[64]; + int i; uint32_t devid = pci_get_devid(dev); - if (devid == SIIS_SII3124) { - device_set_desc_copy(dev, "SiI3124 SATA2 controller"); - } else if (devid == SIIS_SII3132 || - devid == SIIS_SII3132_1 || - devid == SIIS_SII3132_2) { - device_set_desc_copy(dev, "SiI3132 SATA2 controller"); - } else if (devid == SIIS_SII3531) { - device_set_desc_copy(dev, "SiI3531 SATA2 controller"); - } else { - return (ENXIO); + for (i = 0; siis_ids[i].id != 0; i++) { + if (siis_ids[i].id == devid) { + snprintf(buf, sizeof(buf), "%s SATA2 controller", + siis_ids[i].name); + device_set_desc_copy(dev, buf); + return (BUS_PROBE_VENDOR); + } } - - return (BUS_PROBE_VENDOR); + return (ENXIO); } static int @@ -115,8 +128,12 @@ struct siis_controller *ctlr = device_get_softc(dev); uint32_t devid = pci_get_devid(dev); device_t child; - int error, unit; + int error, i, unit; + for (i = 0; siis_ids[i].id != 0; i++) { + if (siis_ids[i].id == devid) + break; + } ctlr->dev = dev; /* Global memory */ ctlr->r_grid = PCIR_BAR(0); @@ -146,8 +163,7 @@ /* Reset controller */ siis_resume(dev); /* Number of HW channels */ - ctlr->channels = (devid == SIIS_SII3124) ? 4 : - (devid == SIIS_SII3531 ? 1 : 2); + ctlr->channels = siis_ids[i].ports; /* Setup interrupts. */ if (siis_setup_interrupt(dev)) { bus_release_resource(dev, SYS_RES_MEMORY, ctlr->r_rid, ctlr->r_mem); ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#4 (text+ko) ==== @@ -137,12 +137,6 @@ #define ATA_SACTIVE 16 -#define SIIS_SII3124 0x31241095 -#define SIIS_SII3132 0x31321095 -#define SIIS_SII3132_1 0x02421095 -#define SIIS_SII3132_2 0x02441095 -#define SIIS_SII3531 0x35311095 - /* * Global registers */ From owner-p4-projects@FreeBSD.ORG Mon Nov 9 19:41:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7B52106568B; Mon, 9 Nov 2009 19:41: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 7AB561065676 for ; Mon, 9 Nov 2009 19:41:31 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 67BED8FC21 for ; Mon, 9 Nov 2009 19:41:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9JfVRV032663 for ; Mon, 9 Nov 2009 19:41:31 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA9JfVwn032661 for perforce@freebsd.org; Mon, 9 Nov 2009 19:41:31 GMT (envelope-from mav@freebsd.org) Date: Mon, 9 Nov 2009 19:41:31 GMT Message-Id: <200911091941.nA9JfVwn032661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170410 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 19:41:31 -0000 http://p4web.freebsd.org/chv.cgi?CH=170410 Change 170410 by mav@mav_mavtest on 2009/11/09 19:40:38 Some BIOSes do not allow to choose SATA controller mode. Some users are not aware of SATA controller modes. Force AHCI for known chipsets. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#75 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#75 (text+ko) ==== @@ -96,23 +96,170 @@ MALLOC_DEFINE(M_AHCI, "AHCI driver", "AHCI driver data buffers"); -/* - * AHCI v1.x compliant SATA chipset support functions - */ +static struct { + uint32_t id; + const char *name; + int flags; +} ahci_ids[] = { + {0x43801002, "ATI IXP600", 0}, + {0x43901002, "ATI IXP700", 0}, + {0x43911002, "ATI IXP700", 0}, + {0x43921002, "ATI IXP700", 0}, + {0x43931002, "ATI IXP700", 0}, + {0x43941002, "ATI IXP800", 0}, + {0x43951002, "ATI IXP800", 0}, + {0x26518086, "Intel ICH6", 0}, + {0x26528086, "Intel ICH6", 0}, + {0x26538086, "Intel ICH6M", 0}, + {0x26808086, "Intel ESB2", 0}, + {0x26818086, "Intel ESB2", 0}, + {0x26828086, "Intel ESB2", 0}, + {0x26838086, "Intel ESB2", 0}, + {0x27c08086, "Intel ICH7", 0}, + {0x27c18086, "Intel ICH7", 0}, + {0x27c38086, "Intel ICH7", 0}, + {0x27c48086, "Intel ICH7M", 0}, + {0x27c58086, "Intel ICH7M", 0}, + {0x27c68086, "Intel ICH7M", 0}, + {0x27c68086, "Intel ICH7M", 0}, + {0x28208086, "Intel ICH8", 0}, + {0x28218086, "Intel ICH8", 0}, + {0x28228086, "Intel ICH8", 0}, + {0x28248086, "Intel ICH8", 0}, + {0x28258086, "Intel ICH8", 0}, + {0x28288086, "Intel ICH8M", 0}, + {0x28298086, "Intel ICH8M", 0}, + {0x282a8086, "Intel ICH8M", 0}, + {0x29208086, "Intel ICH9", 0}, + {0x29218086, "Intel ICH9", 0}, + {0x29228086, "Intel ICH9", 0}, + {0x29238086, "Intel ICH9", 0}, + {0x29248086, "Intel ICH9", 0}, + {0x29258086, "Intel ICH9", 0}, + {0x29268086, "Intel ICH9", 0}, + {0x29278086, "Intel ICH9", 0}, + {0x29298086, "Intel ICH9M", 0}, + {0x292a8086, "Intel ICH9M", 0}, + {0x292b8086, "Intel ICH9M", 0}, + {0x292c8086, "Intel ICH9M", 0}, + {0x292f8086, "Intel ICH9M", 0}, + {0x294d8086, "Intel ICH9", 0}, + {0x294e8086, "Intel ICH9M", 0}, + {0x3a008086, "Intel ICH10", 0}, + {0x3a028086, "Intel ICH10", 0}, + {0x3a058086, "Intel ICH10", 0}, + {0x3a068086, "Intel ICH10", 0}, + {0x3a208086, "Intel ICH10", 0}, + {0x3a228086, "Intel ICH10", 0}, + {0x3a258086, "Intel ICH10", 0}, + {0x3a268086, "Intel ICH10", 0}, + {0x3b228086, "Intel PCH", 0}, + {0x3b238086, "Intel PCH", 0}, + {0x3b248086, "Intel PCH", 0}, + {0x3b258086, "Intel PCH", 0}, + {0x3b298086, "Intel PCH", 0}, + {0x3b2b8086, "Intel PCH", 0}, + {0x3b2c8086, "Intel PCH", 0}, + {0x3b2f8086, "Intel PCH", 0}, + {0x044c10de, "NVIDIA MCP65", 0}, + {0x044d10de, "NVIDIA MCP65", 0}, + {0x044e10de, "NVIDIA MCP65", 0}, + {0x044f10de, "NVIDIA MCP65", 0}, + {0x045c10de, "NVIDIA MCP65", 0}, + {0x045d10de, "NVIDIA MCP65", 0}, + {0x045e10de, "NVIDIA MCP65", 0}, + {0x045f10de, "NVIDIA MCP65", 0}, + {0x055010de, "NVIDIA MCP67", 0}, + {0x055110de, "NVIDIA MCP67", 0}, + {0x055210de, "NVIDIA MCP67", 0}, + {0x055310de, "NVIDIA MCP67", 0}, + {0x055410de, "NVIDIA MCP67", 0}, + {0x055510de, "NVIDIA MCP67", 0}, + {0x055610de, "NVIDIA MCP67", 0}, + {0x055710de, "NVIDIA MCP67", 0}, + {0x055810de, "NVIDIA MCP67", 0}, + {0x055910de, "NVIDIA MCP67", 0}, + {0x055A10de, "NVIDIA MCP67", 0}, + {0x055B10de, "NVIDIA MCP67", 0}, + {0x058410de, "NVIDIA MCP67", 0}, + {0x07f010de, "NVIDIA MCP73", 0}, + {0x07f110de, "NVIDIA MCP73", 0}, + {0x07f210de, "NVIDIA MCP73", 0}, + {0x07f310de, "NVIDIA MCP73", 0}, + {0x07f410de, "NVIDIA MCP73", 0}, + {0x07f510de, "NVIDIA MCP73", 0}, + {0x07f610de, "NVIDIA MCP73", 0}, + {0x07f710de, "NVIDIA MCP73", 0}, + {0x07f810de, "NVIDIA MCP73", 0}, + {0x07f910de, "NVIDIA MCP73", 0}, + {0x07fa10de, "NVIDIA MCP73", 0}, + {0x07fb10de, "NVIDIA MCP73", 0}, + {0x0ad010de, "NVIDIA MCP77", 0}, + {0x0ad110de, "NVIDIA MCP77", 0}, + {0x0ad210de, "NVIDIA MCP77", 0}, + {0x0ad310de, "NVIDIA MCP77", 0}, + {0x0ad410de, "NVIDIA MCP77", 0}, + {0x0ad510de, "NVIDIA MCP77", 0}, + {0x0ad610de, "NVIDIA MCP77", 0}, + {0x0ad710de, "NVIDIA MCP77", 0}, + {0x0ad810de, "NVIDIA MCP77", 0}, + {0x0ad910de, "NVIDIA MCP77", 0}, + {0x0ada10de, "NVIDIA MCP77", 0}, + {0x0adb10de, "NVIDIA MCP77", 0}, + {0x0ab410de, "NVIDIA MCP79", 0}, + {0x0ab510de, "NVIDIA MCP79", 0}, + {0x0ab610de, "NVIDIA MCP79", 0}, + {0x0ab710de, "NVIDIA MCP79", 0}, + {0x0ab810de, "NVIDIA MCP79", 0}, + {0x0ab910de, "NVIDIA MCP79", 0}, + {0x0aba10de, "NVIDIA MCP79", 0}, + {0x0abb10de, "NVIDIA MCP79", 0}, + {0x0abc10de, "NVIDIA MCP79", 0}, + {0x0abd10de, "NVIDIA MCP79", 0}, + {0x0abe10de, "NVIDIA MCP79", 0}, + {0x0abf10de, "NVIDIA MCP79", 0}, + {0x0d8410de, "NVIDIA MCP89", 0}, + {0x0d8510de, "NVIDIA MCP89", 0}, + {0x0d8610de, "NVIDIA MCP89", 0}, + {0x0d8710de, "NVIDIA MCP89", 0}, + {0x0d8810de, "NVIDIA MCP89", 0}, + {0x0d8910de, "NVIDIA MCP89", 0}, + {0x0d8a10de, "NVIDIA MCP89", 0}, + {0x0d8b10de, "NVIDIA MCP89", 0}, + {0x0d8c10de, "NVIDIA MCP89", 0}, + {0x0d8d10de, "NVIDIA MCP89", 0}, + {0x0d8e10de, "NVIDIA MCP89", 0}, + {0x0d8f10de, "NVIDIA MCP89", 0}, + {0x33491106, "VIA VT8251", 0}, + {0x62871106, "VIA VT8251", 0}, + {0x11841039, "SiS 966", 0}, + {0x11851039, "SiS 968", 0}, + {0x01861039, "SiS 968", 0}, + {0, NULL, 0} +}; + static int ahci_probe(device_t dev) { + char buf[64]; + int i; + uint32_t devid = pci_get_devid(dev); - /* is this a possible AHCI candidate ? */ + /* Is this a known AHCI chip? */ + for (i = 0; ahci_ids[i].id != 0; i++) { + if (ahci_ids[i].id == devid) { + snprintf(buf, sizeof(buf), "%s AHCI SATA controller", + ahci_ids[i].name); + device_set_desc_copy(dev, buf); + return (BUS_PROBE_VENDOR); + } + } + /* Is this a possible AHCI candidate? */ if (pci_get_class(dev) != PCIC_STORAGE || - pci_get_subclass(dev) != PCIS_STORAGE_SATA) + pci_get_subclass(dev) != PCIS_STORAGE_SATA || + pci_get_progif(dev) != PCIP_STORAGE_SATA_AHCI_1_0) return (ENXIO); - - /* is this PCI device flagged as an AHCI compliant chip ? */ - if (pci_get_progif(dev) != PCIP_STORAGE_SATA_AHCI_1_0) - return (ENXIO); - - device_set_desc_copy(dev, "AHCI controller"); + device_set_desc_copy(dev, "AHCI SATA controller"); return (BUS_PROBE_VENDOR); } From owner-p4-projects@FreeBSD.ORG Mon Nov 9 23:21:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B2AB1065694; Mon, 9 Nov 2009 23:21:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5FB771065692 for ; Mon, 9 Nov 2009 23:21:12 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4CBF88FC16 for ; Mon, 9 Nov 2009 23:21:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA9NLC4W062884 for ; Mon, 9 Nov 2009 23:21:12 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA9NLCtk062882 for perforce@freebsd.org; Mon, 9 Nov 2009 23:21:12 GMT (envelope-from mav@freebsd.org) Date: Mon, 9 Nov 2009 23:21:12 GMT Message-Id: <200911092321.nA9NLCtk062882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2009 23:21:13 -0000 http://p4web.freebsd.org/chv.cgi?CH=170423 Change 170423 by mav@mav_mavbook on 2009/11/09 23:20:51 Do not attach Intel chips configured to legacy mode. They do not support AHCI, Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#76 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#76 (text+ko) ==== @@ -108,35 +108,24 @@ {0x43931002, "ATI IXP700", 0}, {0x43941002, "ATI IXP800", 0}, {0x43951002, "ATI IXP800", 0}, - {0x26518086, "Intel ICH6", 0}, {0x26528086, "Intel ICH6", 0}, {0x26538086, "Intel ICH6M", 0}, - {0x26808086, "Intel ESB2", 0}, {0x26818086, "Intel ESB2", 0}, {0x26828086, "Intel ESB2", 0}, {0x26838086, "Intel ESB2", 0}, - {0x27c08086, "Intel ICH7", 0}, {0x27c18086, "Intel ICH7", 0}, {0x27c38086, "Intel ICH7", 0}, - {0x27c48086, "Intel ICH7M", 0}, {0x27c58086, "Intel ICH7M", 0}, {0x27c68086, "Intel ICH7M", 0}, - {0x27c68086, "Intel ICH7M", 0}, - {0x28208086, "Intel ICH8", 0}, {0x28218086, "Intel ICH8", 0}, {0x28228086, "Intel ICH8", 0}, {0x28248086, "Intel ICH8", 0}, - {0x28258086, "Intel ICH8", 0}, - {0x28288086, "Intel ICH8M", 0}, {0x28298086, "Intel ICH8M", 0}, {0x282a8086, "Intel ICH8M", 0}, - {0x29208086, "Intel ICH9", 0}, - {0x29218086, "Intel ICH9", 0}, {0x29228086, "Intel ICH9", 0}, {0x29238086, "Intel ICH9", 0}, {0x29248086, "Intel ICH9", 0}, {0x29258086, "Intel ICH9", 0}, - {0x29268086, "Intel ICH9", 0}, {0x29278086, "Intel ICH9", 0}, {0x29298086, "Intel ICH9M", 0}, {0x292a8086, "Intel ICH9M", 0}, @@ -145,14 +134,9 @@ {0x292f8086, "Intel ICH9M", 0}, {0x294d8086, "Intel ICH9", 0}, {0x294e8086, "Intel ICH9M", 0}, - {0x3a008086, "Intel ICH10", 0}, - {0x3a028086, "Intel ICH10", 0}, {0x3a058086, "Intel ICH10", 0}, - {0x3a068086, "Intel ICH10", 0}, - {0x3a208086, "Intel ICH10", 0}, {0x3a228086, "Intel ICH10", 0}, {0x3a258086, "Intel ICH10", 0}, - {0x3a268086, "Intel ICH10", 0}, {0x3b228086, "Intel PCH", 0}, {0x3b238086, "Intel PCH", 0}, {0x3b248086, "Intel PCH", 0}, From owner-p4-projects@FreeBSD.ORG Tue Nov 10 12:40:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A7E3106568F; Tue, 10 Nov 2009 12:40:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F678106566C for ; Tue, 10 Nov 2009 12:40:32 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 13F978FC0C for ; Tue, 10 Nov 2009 12:40:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAACeV7n065628 for ; Tue, 10 Nov 2009 12:40:31 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAACeVn1065626 for perforce@freebsd.org; Tue, 10 Nov 2009 12:40:31 GMT (envelope-from mav@freebsd.org) Date: Tue, 10 Nov 2009 12:40:31 GMT Message-Id: <200911101240.nAACeVn1065626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 12:40:32 -0000 http://p4web.freebsd.org/chv.cgi?CH=170437 Change 170437 by mav@mav_mavbook on 2009/11/10 12:39:55 Move xpt_schedule_dev_sendq() from header to source file. Move delayed queue shrinking to more logical place - when queue freed. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#122 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#13 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#122 (text+ko) ==== @@ -299,12 +299,6 @@ int retval; if (dev->ccbq.devq_openings > 0) { - if ((dev->flags & CAM_DEV_RESIZE_QUEUE_NEEDED) != 0) { - cam_ccbq_resize(&dev->ccbq, - dev->ccbq.dev_openings - + dev->ccbq.dev_active); - dev->flags &= ~CAM_DEV_RESIZE_QUEUE_NEEDED; - } /* * The priority of a device waiting for CCB resources * is that of the the highest priority peripheral driver @@ -321,6 +315,27 @@ } static __inline int +xpt_schedule_dev_sendq(struct cam_eb *bus, struct cam_ed *dev) +{ + int retval; + + if (dev->ccbq.dev_openings > 0) { + /* + * The priority of a device waiting for controller + * resources is that of the the highest priority CCB + * enqueued. + */ + retval = + xpt_schedule_dev(&bus->sim->devq->send_queue, + &dev->send_ccb_entry.pinfo, + CAMQ_GET_HEAD(&dev->ccbq.queue)->priority); + } else { + retval = 0; + } + return (retval); +} + +static __inline int periph_is_queued(struct cam_periph *periph) { return (periph->pinfo.index != CAM_UNQUEUED_INDEX); @@ -3747,6 +3762,11 @@ mtx_assert(sim->mtx, MA_OWNED); cam_ccbq_release_opening(&device->ccbq); + if (device->flags & CAM_DEV_RESIZE_QUEUE_NEEDED) { + device->flags &= ~CAM_DEV_RESIZE_QUEUE_NEEDED; + cam_ccbq_resize(&device->ccbq, + device->ccbq.dev_openings + device->ccbq.dev_active); + } if (sim->ccb_count > sim->max_ccbs) { xpt_free_ccb(free_ccb); sim->ccb_count--; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#13 (text+ko) ==== @@ -177,29 +177,6 @@ u_int32_t new_priority); u_int32_t xpt_dev_ccbq_resize(struct cam_path *path, int newopenings); - - -static __inline int -xpt_schedule_dev_sendq(struct cam_eb *bus, struct cam_ed *dev) -{ - int retval; - - if (dev->ccbq.dev_openings > 0) { - /* - * The priority of a device waiting for controller - * resources is that of the the highest priority CCB - * enqueued. - */ - retval = - xpt_schedule_dev(&bus->sim->devq->send_queue, - &dev->send_ccb_entry.pinfo, - CAMQ_GET_HEAD(&dev->ccbq.queue)->priority); - } else { - retval = 0; - } - return (retval); -} - MALLOC_DECLARE(M_CAMXPT); #endif From owner-p4-projects@FreeBSD.ORG Tue Nov 10 13:16:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 289331065698; Tue, 10 Nov 2009 13:16: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 C881F1065696 for ; Tue, 10 Nov 2009 13:16:07 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B639B8FC19 for ; Tue, 10 Nov 2009 13:16:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAADG7Pi079318 for ; Tue, 10 Nov 2009 13:16:07 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAADG7lO079316 for perforce@freebsd.org; Tue, 10 Nov 2009 13:16:07 GMT (envelope-from mav@freebsd.org) Date: Tue, 10 Nov 2009 13:16:07 GMT Message-Id: <200911101316.nAADG7lO079316@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 13:16:08 -0000 http://p4web.freebsd.org/chv.cgi?CH=170438 Change 170438 by mav@mav_mavbook on 2009/11/10 13:15:30 Wrap duplicate code into xpt_stop_tags(). Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#52 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#123 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#14 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#24 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#52 (text+ko) ==== @@ -1379,24 +1379,7 @@ device->tag_delay_count = CAM_TAG_DELAY_COUNT; device->flags |= CAM_DEV_TAG_AFTER_COUNT; } else { - struct ccb_relsim crs; - - xpt_freeze_devq(cts->ccb_h.path, /*count*/1); - device->inq_flags &= ~SID_CmdQue; - xpt_dev_ccbq_resize(cts->ccb_h.path, - sim->max_dev_openings); - device->flags &= ~CAM_DEV_TAG_AFTER_COUNT; - device->tag_delay_count = 0; - - xpt_setup_ccb(&crs.ccb_h, cts->ccb_h.path, - CAM_PRIORITY_NORMAL); - crs.ccb_h.func_code = XPT_REL_SIMQ; - crs.release_flags = RELSIM_RELEASE_AFTER_QEMPTY; - crs.openings - = crs.release_timeout - = crs.qfrozen_cnt - = 0; - xpt_action((union ccb *)&crs); + xpt_stop_tags(cts->ccb_h.path); } } } ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#123 (text+ko) ==== @@ -285,7 +285,6 @@ static xpt_busfunc_t xptsetasyncbusfunc; static cam_status xptregister(struct cam_periph *periph, void *arg); -static void xpt_start_tags(struct cam_path *path); static __inline int xpt_schedule_dev_allocq(struct cam_eb *bus, struct cam_ed *dev); static __inline int periph_is_queued(struct cam_periph *periph); @@ -4593,7 +4592,7 @@ return (device); } -static void +void xpt_start_tags(struct cam_path *path) { struct ccb_relsim crs; @@ -4622,6 +4621,30 @@ xpt_action((union ccb *)&crs); } +void +xpt_stop_tags(struct cam_path *path) +{ + struct ccb_relsim crs; + struct cam_ed *device; + struct cam_sim *sim; + + device = path->device; + sim = path->bus->sim; + device->flags &= ~CAM_DEV_TAG_AFTER_COUNT; + device->tag_delay_count = 0; + xpt_freeze_devq(path, /*count*/1); + device->inq_flags &= ~SID_CmdQue; + xpt_dev_ccbq_resize(path, sim->max_dev_openings); + xpt_setup_ccb(&crs.ccb_h, path, CAM_PRIORITY_NORMAL); + crs.ccb_h.func_code = XPT_REL_SIMQ; + crs.release_flags = RELSIM_RELEASE_AFTER_QEMPTY; + crs.openings + = crs.release_timeout + = crs.qfrozen_cnt + = 0; + xpt_action((union ccb *)&crs); +} + static int busses_to_config; static int busses_to_reset; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#14 (text+ko) ==== @@ -176,6 +176,8 @@ int xpt_schedule_dev(struct camq *queue, cam_pinfo *dev_pinfo, u_int32_t new_priority); u_int32_t xpt_dev_ccbq_resize(struct cam_path *path, int newopenings); +void xpt_start_tags(struct cam_path *path); +void xpt_stop_tags(struct cam_path *path); MALLOC_DECLARE(M_CAMXPT); ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#24 (text+ko) ==== @@ -2274,24 +2274,7 @@ device->tag_delay_count = CAM_TAG_DELAY_COUNT; device->flags |= CAM_DEV_TAG_AFTER_COUNT; } else { - struct ccb_relsim crs; - - xpt_freeze_devq(cts->ccb_h.path, /*count*/1); - device->inq_flags &= ~SID_CmdQue; - xpt_dev_ccbq_resize(cts->ccb_h.path, - sim->max_dev_openings); - device->flags &= ~CAM_DEV_TAG_AFTER_COUNT; - device->tag_delay_count = 0; - - xpt_setup_ccb(&crs.ccb_h, cts->ccb_h.path, - CAM_PRIORITY_NORMAL); - crs.ccb_h.func_code = XPT_REL_SIMQ; - crs.release_flags = RELSIM_RELEASE_AFTER_QEMPTY; - crs.openings - = crs.release_timeout - = crs.qfrozen_cnt - = 0; - xpt_action((union ccb *)&crs); + xpt_stop_tags(cts->ccb_h.path); } } } From owner-p4-projects@FreeBSD.ORG Tue Nov 10 15:39:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCA4E1065694; Tue, 10 Nov 2009 15:39: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 909CC106568B for ; Tue, 10 Nov 2009 15:39:31 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D97F8FC0C for ; Tue, 10 Nov 2009 15:39:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAFdVb7091749 for ; Tue, 10 Nov 2009 15:39:31 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAAFdVR3091747 for perforce@freebsd.org; Tue, 10 Nov 2009 15:39:31 GMT (envelope-from mav@freebsd.org) Date: Tue, 10 Nov 2009 15:39:31 GMT Message-Id: <200911101539.nAAFdVR3091747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 15:39:32 -0000 http://p4web.freebsd.org/chv.cgi?CH=170441 Change 170441 by mav@mav_mavbook on 2009/11/10 15:38:37 Give ATA XPT initial knowledge about command queueing. Now it sets device queue depth according to information from SIM and device. Limit queue depth for non-NCQ devices by 2 requests as compromise between request sorter effectiveness and minimal request latency. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#53 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#77 edit .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#17 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#53 (text+ko) ==== @@ -66,7 +66,7 @@ #include /* for xpt_print below */ #include "opt_cam.h" -struct scsi_quirk_entry { +struct ata_quirk_entry { struct scsi_inquiry_pattern inq_pat; u_int8_t quirks; #define CAM_QUIRK_NOLUNS 0x01 @@ -76,7 +76,6 @@ u_int mintags; u_int maxtags; }; -#define SCSI_QUIRK(dev) ((struct scsi_quirk_entry *)((dev)->quirk)) static periph_init_t probe_periph_init; @@ -138,7 +137,7 @@ struct cam_periph *periph; } probe_softc; -static struct scsi_quirk_entry scsi_quirk_table[] = +static struct ata_quirk_entry ata_quirk_table[] = { { /* Default tagged queuing parameters for all devices */ @@ -150,8 +149,8 @@ }, }; -static const int scsi_quirk_table_size = - sizeof(scsi_quirk_table) / sizeof(*scsi_quirk_table); +static const int ata_quirk_table_size = + sizeof(ata_quirk_table) / sizeof(*ata_quirk_table); static cam_status proberegister(struct cam_periph *periph, void *arg); @@ -162,7 +161,7 @@ // struct cam_ed *device); static void probedone(struct cam_periph *periph, union ccb *done_ccb); static void probecleanup(struct cam_periph *periph); -static void scsi_find_quirk(struct cam_ed *device); +static void ata_find_quirk(struct cam_ed *device); static void ata_scan_bus(struct cam_periph *periph, union ccb *ccb); static void ata_scan_lun(struct cam_periph *periph, struct cam_path *path, cam_flags flags, @@ -172,10 +171,9 @@ ata_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id); static void ata_device_transport(struct cam_path *path); -static void scsi_set_transfer_settings(struct ccb_trans_settings *cts, +static void ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device, int async_update); -static void scsi_toggle_tags(struct cam_path *path); static void ata_dev_async(u_int32_t async_code, struct cam_eb *bus, struct cam_et *target, @@ -717,6 +715,14 @@ path->device->flags |= CAM_DEV_IDENTIFY_DATA_VALID; } + if (ident_buf->satacapabilities & ATA_SUPPORT_NCQ) { + path->device->mintags = path->device->maxtags = + ATA_QUEUE_LEN(ident_buf->queue) + 1; + } + ata_find_quirk(path->device); + if (path->device->mintags != 0) { + xpt_start_tags(path); + } ata_device_transport(path); PROBE_SET_ACTION(softc, PROBE_SETMODE); xpt_release_ccb(done_ccb); @@ -776,7 +782,6 @@ return; } - scsi_find_quirk(path->device); ata_device_transport(path); if (periph->path->device->flags & CAM_DEV_UNCONFIGURED) { path->device->flags &= ~CAM_DEV_UNCONFIGURED; @@ -853,24 +858,23 @@ } static void -scsi_find_quirk(struct cam_ed *device) +ata_find_quirk(struct cam_ed *device) { - struct scsi_quirk_entry *quirk; + struct ata_quirk_entry *quirk; caddr_t match; match = cam_quirkmatch((caddr_t)&device->inq_data, - (caddr_t)scsi_quirk_table, - sizeof(scsi_quirk_table) / - sizeof(*scsi_quirk_table), - sizeof(*scsi_quirk_table), scsi_inquiry_match); + (caddr_t)ata_quirk_table, + ata_quirk_table_size, + sizeof(*ata_quirk_table), scsi_inquiry_match); if (match == NULL) panic("xpt_find_quirk: device didn't match wildcard entry!!"); - quirk = (struct scsi_quirk_entry *)match; + quirk = (struct ata_quirk_entry *)match; device->quirk = quirk; - device->mintags = quirk->mintags; - device->maxtags = quirk->maxtags; +// device->mintags = quirk->mintags; +// device->maxtags = quirk->maxtags; } typedef struct { @@ -1101,7 +1105,7 @@ ata_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id) { struct cam_path path; - struct scsi_quirk_entry *quirk; + struct ata_quirk_entry *quirk; struct cam_ed *device; struct cam_ed *cur_device; @@ -1113,10 +1117,10 @@ * Take the default quirk entry until we have inquiry * data and can determine a better quirk to use. */ - quirk = &scsi_quirk_table[scsi_quirk_table_size - 1]; + quirk = &ata_quirk_table[ata_quirk_table_size - 1]; device->quirk = (void *)quirk; - device->mintags = quirk->mintags; - device->maxtags = quirk->maxtags; + device->mintags = 0; + device->maxtags = 0; bzero(&device->inq_data, sizeof(device->inq_data)); device->inq_flags = 0; device->queue_flags = 0; @@ -1199,7 +1203,7 @@ switch (start_ccb->ccb_h.func_code) { case XPT_SET_TRAN_SETTINGS: { - scsi_set_transfer_settings(&start_ccb->cts, + ata_set_transfer_settings(&start_ccb->cts, start_ccb->ccb_h.path->device, /*async_update*/FALSE); break; @@ -1227,7 +1231,7 @@ } static void -scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device, +ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device, int async_update) { struct ccb_pathinq cpi; @@ -1387,39 +1391,6 @@ (*(sim->sim_action))(sim, (union ccb *)cts); } -static void -scsi_toggle_tags(struct cam_path *path) -{ - struct cam_ed *dev; - - /* - * Give controllers a chance to renegotiate - * before starting tag operations. We - * "toggle" tagged queuing off then on - * which causes the tag enable command delay - * counter to come into effect. - */ - dev = path->device; - if ((dev->flags & CAM_DEV_TAG_AFTER_COUNT) != 0 - || ((dev->inq_flags & SID_CmdQue) != 0 - && (dev->inq_flags & (SID_Sync|SID_WBus16|SID_WBus32)) != 0)) { - struct ccb_trans_settings cts; - - xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL); - cts.protocol = PROTO_SCSI; - cts.protocol_version = PROTO_VERSION_UNSPECIFIED; - cts.transport = XPORT_UNSPECIFIED; - cts.transport_version = XPORT_VERSION_UNSPECIFIED; - cts.proto_specific.scsi.flags = 0; - cts.proto_specific.scsi.valid = CTS_SCSI_VALID_TQ; - scsi_set_transfer_settings(&cts, path->device, - /*async_update*/TRUE); - cts.proto_specific.scsi.flags = CTS_SCSI_FLAGS_TAG_ENB; - scsi_set_transfer_settings(&cts, path->device, - /*async_update*/TRUE); - } -} - /* * Handle any per-device event notifications that require action by the XPT. */ @@ -1452,15 +1423,6 @@ status = CAM_REQ_CMP_ERR; if (status == CAM_REQ_CMP) { - - /* - * Allow transfer negotiation to occur in a - * tag free environment. - */ - if (async_code == AC_SENT_BDR - || async_code == AC_BUS_RESET) - scsi_toggle_tags(&newpath); - if (async_code == AC_INQ_CHANGED) { /* * We've sent a start unit command, or @@ -1481,7 +1443,7 @@ struct ccb_trans_settings *settings; settings = (struct ccb_trans_settings *)async_arg; - scsi_set_transfer_settings(settings, device, + ata_set_transfer_settings(settings, device, /*async_update*/TRUE); } } ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#77 (text+ko) ==== @@ -733,7 +733,8 @@ } /* Construct SIM entry */ ch->sim = cam_sim_alloc(ahciaction, ahcipoll, "ahcich", ch, - device_get_unit(dev), &ch->mtx, ch->numslots, 0, devq); + device_get_unit(dev), &ch->mtx, + min(2, ch->numslots), ch->numslots, devq); if (ch->sim == NULL) { device_printf(dev, "unable to allocate sim\n"); error = ENOMEM; ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#17 (text+ko) ==== @@ -454,7 +454,7 @@ } /* Construct SIM entry */ ch->sim = cam_sim_alloc(siisaction, siispoll, "siisch", ch, - device_get_unit(dev), &ch->mtx, SIIS_MAX_SLOTS, 0, devq); + device_get_unit(dev), &ch->mtx, 2, SIIS_MAX_SLOTS, devq); if (ch->sim == NULL) { device_printf(dev, "unable to allocate sim\n"); error = ENOMEM; From owner-p4-projects@FreeBSD.ORG Tue Nov 10 20:35:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AED17106568B; Tue, 10 Nov 2009 20:35:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 732D5106566B for ; Tue, 10 Nov 2009 20:35:27 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 609958FC1C for ; Tue, 10 Nov 2009 20:35:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAKZRIU028868 for ; Tue, 10 Nov 2009 20:35:27 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAAKZRcH028866 for perforce@freebsd.org; Tue, 10 Nov 2009 20:35:27 GMT (envelope-from mav@freebsd.org) Date: Tue, 10 Nov 2009 20:35:27 GMT Message-Id: <200911102035.nAAKZRcH028866@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 20:35:27 -0000 http://p4web.freebsd.org/chv.cgi?CH=170444 Change 170444 by mav@mav_mavbook on 2009/11/10 20:34:42 Implement quirk matching for ATA. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#21 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#21 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#41 edit .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#54 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#12 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#21 (text+ko) ==== @@ -519,3 +519,38 @@ return (mode); } +int +ata_identify_match(caddr_t identbuffer, caddr_t table_entry) +{ + struct scsi_inquiry_pattern *entry; + struct ata_params *ident; + + entry = (struct scsi_inquiry_pattern *)table_entry; + ident = (struct ata_params *)identbuffer; + + if ((cam_strmatch(ident->model, entry->product, + sizeof(ident->model)) == 0) + && (cam_strmatch(ident->revision, entry->revision, + sizeof(ident->revision)) == 0)) { + return (0); + } + return (-1); +} + +int +ata_static_identify_match(caddr_t identbuffer, caddr_t table_entry) +{ + struct scsi_static_inquiry_pattern *entry; + struct ata_params *ident; + + entry = (struct scsi_static_inquiry_pattern *)table_entry; + ident = (struct ata_params *)identbuffer; + + if ((cam_strmatch(ident->model, entry->product, + sizeof(ident->model)) == 0) + && (cam_strmatch(ident->revision, entry->revision, + sizeof(ident->revision)) == 0)) { + return (0); + } + return (-1); +} ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#21 (text+ko) ==== @@ -115,4 +115,7 @@ int ata_max_umode(struct ata_params *ap); int ata_max_mode(struct ata_params *ap, int mode, int maxmode); +int ata_identify_match(caddr_t identbuffer, caddr_t table_entry); +int ata_static_identify_match(caddr_t identbuffer, caddr_t table_entry); + #endif ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#41 (text+ko) ==== @@ -122,9 +122,17 @@ ada_quirks quirks; }; -//static struct ada_quirk_entry ada_quirk_table[] = -//{ -//}; +static struct ada_quirk_entry ada_quirk_table[] = +{ + { + /* Default */ + { + T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, + /*vendor*/"*", /*product*/"*", /*revision*/"*" + }, + /*quirks*/0 + }, +}; static disk_strategy_t adastrategy; static dumper_t adadump; @@ -627,12 +635,10 @@ /* * See if this device has any quirks. */ -// match = cam_quirkmatch((caddr_t)&cgd->inq_data, -// (caddr_t)ada_quirk_table, -// sizeof(ada_quirk_table)/sizeof(*ada_quirk_table), -// sizeof(*ada_quirk_table), scsi_inquiry_match); - match = NULL; - + match = cam_quirkmatch((caddr_t)&cgd->ident_data, + (caddr_t)ada_quirk_table, + sizeof(ada_quirk_table)/sizeof(*ada_quirk_table), + sizeof(*ada_quirk_table), ata_identify_match); if (match != NULL) softc->quirks = ((struct ada_quirk_entry *)match)->quirks; else ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#54 (text+ko) ==== @@ -69,11 +69,7 @@ struct ata_quirk_entry { struct scsi_inquiry_pattern inq_pat; u_int8_t quirks; -#define CAM_QUIRK_NOLUNS 0x01 -#define CAM_QUIRK_NOSERIAL 0x02 -#define CAM_QUIRK_HILUNS 0x04 -#define CAM_QUIRK_NOHILUNS 0x08 - u_int mintags; +#define CAM_QUIRK_MAXTAGS 0x01 u_int maxtags; }; @@ -145,7 +141,7 @@ T_ANY, SIP_MEDIA_REMOVABLE|SIP_MEDIA_FIXED, /*vendor*/"*", /*product*/"*", /*revision*/"*" }, - /*quirks*/0, /*mintags*/2, /*maxtags*/32 + /*quirks*/0, /*maxtags*/0 }, }; @@ -863,18 +859,18 @@ struct ata_quirk_entry *quirk; caddr_t match; - match = cam_quirkmatch((caddr_t)&device->inq_data, + match = cam_quirkmatch((caddr_t)&device->ident_data, (caddr_t)ata_quirk_table, ata_quirk_table_size, - sizeof(*ata_quirk_table), scsi_inquiry_match); + sizeof(*ata_quirk_table), ata_identify_match); if (match == NULL) panic("xpt_find_quirk: device didn't match wildcard entry!!"); quirk = (struct ata_quirk_entry *)match; device->quirk = quirk; -// device->mintags = quirk->mintags; -// device->maxtags = quirk->maxtags; + if (quirk->quirks & CAM_QUIRK_MAXTAGS) + device->mintags = device->maxtags = quirk->maxtags; } typedef struct { ==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#12 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Nov 10 20:57:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DC691065698; Tue, 10 Nov 2009 20:57:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5F4B1065672 for ; Tue, 10 Nov 2009 20:57:49 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BACAF8FC1D for ; Tue, 10 Nov 2009 20:57:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAKvnlJ040681 for ; Tue, 10 Nov 2009 20:57:49 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAAKvnVA040679 for perforce@freebsd.org; Tue, 10 Nov 2009 20:57:49 GMT (envelope-from mav@freebsd.org) Date: Tue, 10 Nov 2009 20:57:49 GMT Message-Id: <200911102057.nAAKvnVA040679@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 20:57:50 -0000 http://p4web.freebsd.org/chv.cgi?CH=170446 Change 170446 by mav@mav_mavbook on 2009/11/10 20:57:01 Addition to previous commit. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#13 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#13 (text+ko) ==== @@ -165,8 +165,12 @@ str++; str_len--; } - while (str_len > 0 && *str++ == ' ') + while (str_len > 0 && *str == ' ') { + str++; str_len--; + } + if (str_len > 0 && *str == 0) + str_len = 0; return (str_len); } From owner-p4-projects@FreeBSD.ORG Tue Nov 10 21:00:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4338C1065679; Tue, 10 Nov 2009 21:00: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 080411065672 for ; Tue, 10 Nov 2009 21:00:53 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA24F8FC1B for ; Tue, 10 Nov 2009 21:00:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAL0qSG040923 for ; Tue, 10 Nov 2009 21:00:52 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAAL0q5j040921 for perforce@freebsd.org; Tue, 10 Nov 2009 21:00:52 GMT (envelope-from mav@freebsd.org) Date: Tue, 10 Nov 2009 21:00:52 GMT Message-Id: <200911102100.nAAL0q5j040921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 21:00:53 -0000 http://p4web.freebsd.org/chv.cgi?CH=170447 Change 170447 by mav@mav_mavbook on 2009/11/10 21:00:23 Make ADA honor XPT mind about queueing support. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#42 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#30 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#124 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#42 (text+ko) ==== @@ -626,7 +626,7 @@ if (cgd->ident_data.support.command2 & ATA_SUPPORT_FLUSHCACHE) softc->flags |= ADA_FLAG_CAN_FLUSHCACHE; if (cgd->ident_data.satacapabilities & ATA_SUPPORT_NCQ && - cgd->ident_data.queue >= 31) + cgd->inq_flags & SID_CmdQue) softc->flags |= ADA_FLAG_CAN_NCQ; softc->state = ADA_STATE_NORMAL; @@ -706,11 +706,6 @@ dp->secsize, dp->heads, dp->secs_per_track, dp->cylinders); xpt_announce_periph(periph, announce_buf); - if (softc->flags & ADA_FLAG_CAN_NCQ) { - printf("%s%d: Native Command Queueing enabled\n", - periph->periph_name, periph->unit_number); - } - /* * Add async callbacks for bus reset and * bus device reset calls. I don't bother ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#30 (text+ko) ==== @@ -307,7 +307,7 @@ struct scsi_inquiry_data inq_data; struct ata_params ident_data; u_int8_t serial_num[252]; - u_int8_t reserved; + u_int8_t inq_flags; u_int8_t serial_num_len; }; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#124 (text+ko) ==== @@ -2671,6 +2671,7 @@ cgd->protocol = dev->protocol; cgd->inq_data = dev->inq_data; cgd->ident_data = dev->ident_data; + cgd->inq_flags = dev->inq_flags; cgd->ccb_h.status = CAM_REQ_CMP; cgd->serial_num_len = dev->serial_num_len; if ((dev->serial_num_len > 0) From owner-p4-projects@FreeBSD.ORG Tue Nov 10 21:18:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0956106568B; Tue, 10 Nov 2009 21:18:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65404106566B for ; Tue, 10 Nov 2009 21:18:10 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 538008FC0C for ; Tue, 10 Nov 2009 21:18:10 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAALIA9f043101 for ; Tue, 10 Nov 2009 21:18:10 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAALIA0I043099 for perforce@freebsd.org; Tue, 10 Nov 2009 21:18:10 GMT (envelope-from mav@freebsd.org) Date: Tue, 10 Nov 2009 21:18:10 GMT Message-Id: <200911102118.nAALIA0I043099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170448 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 21:18:10 -0000 http://p4web.freebsd.org/chv.cgi?CH=170448 Change 170448 by mav@mav_mavbook on 2009/11/10 21:17:34 Temporary disable tagged queuing if not all SIM-supported tags supported by device. We will need to tell which are. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#55 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#55 (text+ko) ==== @@ -716,6 +716,9 @@ ATA_QUEUE_LEN(ident_buf->queue) + 1; } ata_find_quirk(path->device); + /* XXX: If not all tags allowed, we must to tell SIM which are. */ + if (path->device->mintags < path->bus->sim->max_tagged_dev_openings) + path->device->mintags = path->device->maxtags = 0; if (path->device->mintags != 0) { xpt_start_tags(path); } From owner-p4-projects@FreeBSD.ORG Tue Nov 10 21:44:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4795E1065694; Tue, 10 Nov 2009 21:44:37 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BCF51065692 for ; Tue, 10 Nov 2009 21:44:37 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ECEFC8FC1B for ; Tue, 10 Nov 2009 21:44:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAALiaBE045050 for ; Tue, 10 Nov 2009 21:44:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAALiaG4045048 for perforce@freebsd.org; Tue, 10 Nov 2009 21:44:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 10 Nov 2009 21:44:36 GMT Message-Id: <200911102144.nAALiaG4045048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170449 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 21:44:37 -0000 http://p4web.freebsd.org/chv.cgi?CH=170449 Change 170449 by hselasky@hselasky_laptop001 on 2009/11/10 21:43:38 USB CORE: - improve and factor out USB High-Speed slot allocation mechanism. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#43 edit .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#30 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#57 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#37 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#15 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#172 edit .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#43 (text+ko) ==== @@ -2020,8 +2020,8 @@ qh_endphub = (EHCI_QH_SET_MULT(xfer->max_packet_count & 3) | - EHCI_QH_SET_CMASK(xfer->usb_cmask) | - EHCI_QH_SET_SMASK(xfer->usb_smask) | + EHCI_QH_SET_CMASK(xfer->endpoint->usb_cmask) | + EHCI_QH_SET_SMASK(xfer->endpoint->usb_smask) | EHCI_QH_SET_HUBA(xfer->xroot->udev->hs_hub_addr) | EHCI_QH_SET_PORT(xfer->xroot->udev->hs_port_no)); @@ -2166,7 +2166,7 @@ DPRINTFN(2, "status=0x%08x, len=%u\n", status, len); - if (xfer->usb_smask & (1 << td_no)) { + if (xfer->endpoint->usb_smask & (1 << td_no)) { if (*plen >= len) { /* @@ -2352,25 +2352,9 @@ uint16_t best; uint16_t bit; uint16_t x; - uint8_t slot; - /* Allocate a microframe slot first: */ - - slot = usb_intr_schedule_adjust(xfer->xroot->udev, - xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, 0x01); - - if (usbd_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { - xfer->usb_uframe = slot; - xfer->usb_smask = (0x01 << slot) & 0xFF; - xfer->usb_cmask = 0x00; - } else { - xfer->usb_uframe = slot; - xfer->usb_smask = (0x01 << slot) & 0x3F; - xfer->usb_cmask = (-(0x04 << slot)) & 0xFE; - } + usb_hs_bandwidth_alloc(xfer); - DPRINTFN(11, "slot=%d\n", slot); - /* * Find the best QH position corresponding to the given interval: */ @@ -2405,14 +2389,12 @@ { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); - /* Free microframe slot: */ - - usb_intr_schedule_adjust(xfer->xroot->udev, - -xfer->max_frame_size, xfer->usb_uframe, 0x01); - sc->sc_intr_stat[xfer->qh_pos]--; ehci_device_done(xfer, USB_ERR_CANCELLED); + + /* bandwidth must be freed after device done */ + usb_hs_bandwidth_free(xfer); } static void @@ -2734,35 +2716,9 @@ ehci_itd_t *td; uint32_t temp; uint8_t ds; - uint8_t slot; - uint8_t mask; - switch (usbd_xfer_get_fps_shift(xfer)) { - case 0: - mask = 0xFF; - break; - case 1: - mask = 0x55; - break; - case 2: - mask = 0x11; - break; - default: - mask = 0x01; - break; - } - - /* Allocate a microframe multi-slot first: */ - - slot = usb_intr_schedule_adjust(xfer->xroot->udev, - xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, mask); + usb_hs_bandwidth_alloc(xfer); - xfer->usb_uframe = slot; - xfer->usb_cmask = 0; - xfer->usb_smask = mask << slot; - - DPRINTFN(11, "slot=%d, mask=0x%02x\n", slot, mask); - /* initialize all TD's */ for (ds = 0; ds != 2; ds++) { @@ -2805,14 +2761,10 @@ static void ehci_device_isoc_hs_close(struct usb_xfer *xfer) { + ehci_device_done(xfer, USB_ERR_CANCELLED); - /* Free microframe multi-slot: */ - - usb_intr_schedule_adjust(xfer->xroot->udev, - -xfer->max_frame_size, xfer->usb_uframe, - xfer->usb_smask >> xfer->usb_uframe); - - ehci_device_done(xfer, USB_ERR_CANCELLED); + /* bandwidth must be freed after device done */ + usb_hs_bandwidth_free(xfer); } static void @@ -2922,7 +2874,7 @@ *plen = xfer->max_frame_size; } - if (xfer->usb_smask & (1 << td_no)) { + if (xfer->endpoint->usb_smask & (1 << td_no)) { status = (EHCI_ITD_SET_LEN(*plen) | EHCI_ITD_ACTIVE | EHCI_ITD_SET_PG(0)); ==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#30 (text+ko) ==== @@ -161,9 +161,6 @@ uint8_t address; /* physical USB address */ uint8_t endpointno; /* physical USB endpoint */ uint8_t max_packet_count; - uint8_t usb_smask; - uint8_t usb_cmask; - uint8_t usb_uframe; uint8_t usb_state; uint8_t fps_shift; /* down shift of FPS, 0..3 */ ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#57 (text+ko) ==== @@ -665,7 +665,7 @@ /* look for matching endpoints */ if ((iface_index == USB_IFACE_INDEX_ANY) || (iface_index == ep->iface_index)) { - if (ep->refcount != 0) { + if (ep->refcount_alloc != 0) { /* * This typically indicates a * more serious error. ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#37 (text+ko) ==== @@ -1145,7 +1145,7 @@ } /*------------------------------------------------------------------------* - * usb_intr_schedule_adjust + * usb_hs_bandwidth_adjust * * This function will update the bandwith usage for the microframe * having index "slot" by "len" bytes. "len" can be negative. If the @@ -1156,8 +1156,8 @@ * Returns: * The slot in which the bandwidth update was done: 0..7 *------------------------------------------------------------------------*/ -uint8_t -usb_intr_schedule_adjust(struct usb_device *udev, int16_t len, +static uint8_t +usb_hs_bandwidth_adjust(struct usb_device *udev, int16_t len, uint8_t slot, uint8_t mask) { struct usb_bus *bus = udev->bus; @@ -1210,6 +1210,132 @@ } /*------------------------------------------------------------------------* + * usb_hs_bandwidth_alloc + * + * This function is a wrapper function for "usb_hs_bandwidth_adjust()". + *------------------------------------------------------------------------*/ +void +usb_hs_bandwidth_alloc(struct usb_xfer *xfer) +{ + struct usb_device *udev; + uint8_t slot; + uint8_t mask; + uint8_t speed; + + udev = xfer->xroot->udev; + + if (udev->flags.usb_mode != USB_MODE_HOST) + return; /* not supported */ + + xfer->endpoint->refcount_bw++; + if (xfer->endpoint->refcount_bw != 1) + return; /* already allocated */ + + speed = usbd_get_speed(udev); + + switch (xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE) { + case UE_INTERRUPT: + /* allocate a microframe slot */ + + mask = 0x01; + slot = usb_hs_bandwidth_adjust(udev, + xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, mask); + + xfer->endpoint->usb_uframe = slot; + xfer->endpoint->usb_smask = mask << slot; + + if ((speed != USB_SPEED_FULL) && + (speed != USB_SPEED_LOW)) { + xfer->endpoint->usb_cmask = 0x00 ; + } else { + xfer->endpoint->usb_cmask = (-(0x04 << slot)) & 0xFE; + } + break; + + case UE_ISOCHRONOUS: + switch (usbd_xfer_get_fps_shift(xfer)) { + case 0: + mask = 0xFF; + break; + case 1: + mask = 0x55; + break; + case 2: + mask = 0x11; + break; + default: + mask = 0x01; + break; + } + + /* allocate a microframe multi-slot */ + + slot = usb_hs_bandwidth_adjust(udev, + xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX, mask); + + xfer->endpoint->usb_uframe = slot; + xfer->endpoint->usb_cmask = 0; + xfer->endpoint->usb_smask = mask << slot; + break; + + default: + xfer->endpoint->usb_uframe = 0; + xfer->endpoint->usb_cmask = 0; + xfer->endpoint->usb_smask = 0; + break; + } + + DPRINTFN(11, "slot=%d, mask=0x%02x\n", + xfer->endpoint->usb_uframe, + xfer->endpoint->usb_smask >> xfer->endpoint->usb_uframe); +} + +/*------------------------------------------------------------------------* + * usb_hs_bandwidth_free + * + * This function is a wrapper function for "usb_hs_bandwidth_adjust()". + *------------------------------------------------------------------------*/ +void +usb_hs_bandwidth_free(struct usb_xfer *xfer) +{ + struct usb_device *udev; + uint8_t slot; + uint8_t mask; + + udev = xfer->xroot->udev; + + if (udev->flags.usb_mode != USB_MODE_HOST) + return; /* not supported */ + + xfer->endpoint->refcount_bw--; + if (xfer->endpoint->refcount_bw != 0) + return; /* still allocated */ + + switch (xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE) { + case UE_INTERRUPT: + case UE_ISOCHRONOUS: + + slot = xfer->endpoint->usb_uframe; + mask = xfer->endpoint->usb_smask; + + /* free microframe slot(s): */ + usb_hs_bandwidth_adjust(udev, + -xfer->max_frame_size, slot, mask >> slot); + + DPRINTFN(11, "slot=%d, mask=0x%02x\n", + slot, mask >> slot); + + xfer->endpoint->usb_uframe = 0; + xfer->endpoint->usb_cmask = 0; + xfer->endpoint->usb_smask = 0; + break; + + default: + break; + } +} + +/*------------------------------------------------------------------------* * usbd_fs_isoc_schedule_init_sub * * This function initialises an USB FULL speed isochronous schedule ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#15 (text+ko) ==== @@ -66,8 +66,8 @@ /* function prototypes */ -uint8_t usb_intr_schedule_adjust(struct usb_device *udev, int16_t len, - uint8_t slot, uint8_t mask); +void usb_hs_bandwidth_alloc(struct usb_xfer *xfer); +void usb_hs_bandwidth_free(struct usb_xfer *xfer); void usbd_fs_isoc_schedule_init_all(struct usb_fs_isoc_schedule *fss); void usb_bus_port_set_device(struct usb_bus *bus, struct usb_port *up, struct usb_device *udev, uint8_t device_index); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#172 (text+ko) ==== @@ -942,10 +942,18 @@ * configuration and alternate setting * when USB transfers are in use on * the given interface. Search the USB - * code for "endpoint->refcount" if you + * code for "endpoint->refcount_alloc" if you * want more information. */ - xfer->endpoint->refcount++; + USB_BUS_LOCK(info->bus); + if (xfer->endpoint->refcount_alloc >= USB_EP_REF_MAX) + parm.err = USB_ERR_INVAL; + + xfer->endpoint->refcount_alloc++; + + if (xfer->endpoint->refcount_alloc == 0) + panic("usbd_transfer_setup(): Refcount wrapped to zero\n"); + USB_BUS_UNLOCK(info->bus); /* * Whenever we set ppxfer[] then we @@ -960,6 +968,10 @@ */ ppxfer[n] = xfer; } + + /* check for error */ + if (parm.err) + goto done; } if (buf || parm.err) { @@ -1179,7 +1191,9 @@ * NOTE: default endpoint does not have an * interface, even if endpoint->iface_index == 0 */ - xfer->endpoint->refcount--; + USB_BUS_LOCK(info->bus); + xfer->endpoint->refcount_alloc--; + USB_BUS_UNLOCK(info->bus); usb_callout_drain(&xfer->timeout_handle); ==== //depot/projects/usb/src/sys/dev/usb/usbdi.h#14 (text+ko) ==== @@ -130,13 +130,22 @@ struct usb_pipe_methods *methods; /* set by HC driver */ uint16_t isoc_next; - uint16_t refcount; uint8_t toggle_next:1; /* next data toggle value */ uint8_t is_stalled:1; /* set if endpoint is stalled */ uint8_t is_synced:1; /* set if we a synchronised */ uint8_t unused:5; uint8_t iface_index; /* not used by "default endpoint" */ + + uint8_t refcount_alloc; /* allocation refcount */ + uint8_t refcount_bw; /* bandwidth refcount */ +#define USB_EP_REF_MAX 0x3f + + /* High-Speed resource allocation (valid if "refcount_bw" > 0) */ + + uint8_t usb_smask; /* USB start mask */ + uint8_t usb_cmask; /* USB complete mask */ + uint8_t usb_uframe; /* USB microframe */ }; /* From owner-p4-projects@FreeBSD.ORG Wed Nov 11 10:48:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DA5F1065676; Wed, 11 Nov 2009 10:48:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 116901065670 for ; Wed, 11 Nov 2009 10:48:43 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1BCF8FC08 for ; Wed, 11 Nov 2009 10:48:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABAmg8V046107 for ; Wed, 11 Nov 2009 10:48:42 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABAmgbc046105 for perforce@freebsd.org; Wed, 11 Nov 2009 10:48:42 GMT (envelope-from mav@freebsd.org) Date: Wed, 11 Nov 2009 10:48:42 GMT Message-Id: <200911111048.nABAmgbc046105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 10:48:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=170471 Change 170471 by mav@mav_mavbook on 2009/11/11 10:48:39 IFC Affected files ... .. //depot/projects/scottl-camlock/src/UPDATING#21 integrate .. //depot/projects/scottl-camlock/src/contrib/ee/ee.c#4 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/ssh_namespace.h#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/C.msg#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/Makefile.inc#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/ja_JP.UTF-8.msg#1 branch .. //depot/projects/scottl-camlock/src/lib/libc/nls/ja_JP.eucJP.msg#1 branch .. //depot/projects/scottl-camlock/src/lib/libusb/libusb.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_desc.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10_io.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb20_ugen20.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#9 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#29 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/reboot.c#3 integrate .. //depot/projects/scottl-camlock/src/secure/lib/libssh/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/antarctica#4 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/isa/isa_dma.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/trap.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/vm_machdep.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#41 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#53 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_an.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/an/if_anreg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ieee488/ibfoo.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_ixp4xx.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_mbus.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/atp.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ums.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_core.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_transfer.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/trap.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/vm_machdep.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/isa/isa_dma.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/trap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/vm_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_lookup.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/pcb.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/trap.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/vm_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#12 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/atp/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_ioctl.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_ipsec.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/vm_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/trap.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/vm_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/rpc/clnt_vc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/pcb.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/vm_machdep.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/trap.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/vm_machdep.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#28 integrate .. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_subr.h#5 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-flopen.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gzip/unbzip2.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/acpi.c#2 delete .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/acpidump.h#2 delete .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/biosmptable.c#2 delete .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/install.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/menus.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/sysinstall.8#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/vidcontrol/vidcontrol.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/vidcontrol/vidcontrol.c#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/UPDATING#21 (text+ko) ==== @@ -22,6 +22,11 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091109: + The layout of the structure ieee80211req_scan_result has changed. + Applications that require wireless scan results (e.g. ifconfig(8)) + from net80211 need to be recompiled. + 20091025: The iwn(4) driver has been updated to support the 5000 and 5150 series. There's one kernel module for each firmware. Adding "device iwnfw" @@ -1052,4 +1057,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.644 2009/11/03 21:06:19 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.645 2009/11/09 16:05:32 rpaulo Exp $ ==== //depot/projects/scottl-camlock/src/contrib/ee/ee.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.7 2009/09/04 07:42:13 ache Exp $"); +__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.8 2009/11/10 00:48:24 delphij Exp $"); char *ee_copyright_message = "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2009 Hugh Mahon "; @@ -1989,7 +1989,7 @@ int number; int i; char *ptr; - char *direction = NULL; + char *direction = "d"; struct text *t_line; ptr = cmd_str; ==== //depot/projects/scottl-camlock/src/crypto/openssh/ssh_namespace.h#5 (text) ==== @@ -9,7 +9,7 @@ * * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }' * - * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.8 2009/10/05 18:55:13 des Exp $ + * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.9 2009/11/10 09:45:43 des Exp $ */ #define a2port ssh_a2port @@ -223,6 +223,8 @@ #define get_u32 ssh_get_u32 #define get_u64 ssh_get_u64 #define getrrsetbyname ssh_getrrsetbyname +#define glob ssh_glob +#define globfree ssh_globfree #define host_hash ssh_host_hash #define hostfile_read_key ssh_hostfile_read_key #define hpdelim ssh_hpdelim ==== //depot/projects/scottl-camlock/src/lib/libc/gen/fmtmsg.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.5 2003/05/01 19:03:13 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.6 2009/11/08 14:02:54 brueffer Exp $"); #include #include @@ -128,7 +128,7 @@ size += strlen(sevname); if (text != MM_NULLTXT) size += strlen(text); - if (text != MM_NULLACT) + if (act != MM_NULLACT) size += strlen(act); if (tag != MM_NULLTAG) size += strlen(tag); ==== //depot/projects/scottl-camlock/src/lib/libc/net/gai_strerror.c#2 (text+ko) ==== @@ -28,9 +28,19 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gai_strerror.c,v 1.2 2006/05/21 11:22:31 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gai_strerror.c,v 1.3 2009/11/09 12:46:59 ume Exp $"); +#include "namespace.h" #include +#if defined(NLS) +#include +#include +#include +#include +#include +#include "reentrant.h" +#endif +#include "un-namespace.h" /* Entries EAI_ADDRFAMILY (1) and EAI_NODATA (7) are obsoleted, but left */ /* for backward compatibility with userland code prior to 2553bis-02 */ @@ -52,9 +62,57 @@ "Argument buffer overflow" /* EAI_OVERFLOW */ }; +#if defined(NLS) +static char gai_buf[NL_TEXTMAX]; +static once_t gai_init_once = ONCE_INITIALIZER; +static thread_key_t gai_key; +static int gai_keycreated = 0; + +static void +gai_keycreate(void) +{ + gai_keycreated = (thr_keycreate(&gai_key, free) == 0); +} +#endif + const char * gai_strerror(int ecode) { +#if defined(NLS) + nl_catd catd; + char *buf; + + if (thr_main() != 0) + buf = gai_buf; + else { + if (thr_once(&gai_init_once, gai_keycreate) != 0 || + !gai_keycreated) + goto thr_err; + if ((buf = thr_getspecific(gai_key)) == NULL) { + if ((buf = malloc(sizeof(gai_buf))) == NULL) + goto thr_err; + if (thr_setspecific(gai_key, buf) != 0) { + free(buf); + goto thr_err; + } + } + } + + catd = catopen("libc", NL_CAT_LOCALE); + if (ecode > 0 && ecode < EAI_MAX) + strlcpy(buf, catgets(catd, 3, ecode, ai_errlist[ecode]), + sizeof(gai_buf)); + else if (ecode == 0) + strlcpy(buf, catgets(catd, 3, NL_MSGMAX - 1, "Success"), + sizeof(gai_buf)); + else + strlcpy(buf, catgets(catd, 3, NL_MSGMAX, "Unknown error"), + sizeof(gai_buf)); + catclose(catd); + return buf; + +thr_err: +#endif if (ecode >= 0 && ecode < EAI_MAX) return ai_errlist[ecode]; return "Unknown error"; ==== //depot/projects/scottl-camlock/src/lib/libc/nls/C.msg#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/C.msg,v 1.2 2009/10/13 17:57:06 rwatson Exp $ +$ $FreeBSD: src/lib/libc/nls/C.msg,v 1.3 2009/11/09 12:46:59 ume Exp $ $ $ Message catalog for C locale (template) $ @@ -257,3 +257,39 @@ 30 User defined signal 1 $ SIGUSR2 31 User defined signal 2 +$ +$ gai_strerror() support catalog +$ +$set 3 +$ 1 (obsolete) +1 Address family for hostname not supported +$ EAI_AGAIN +2 Temporary failure in name resolution +$ EAI_BADFLAGS +3 Invalid value for ai_flags +$ EAI_FAIL +4 Non-recoverable failure in name resolution +$ EAI_FAMILY +5 ai_family not supported +$ EAI_MEMORY +6 Memory allocation failure +$ 7 (obsolete) +7 No address associated with hostname +$ EAI_NONAME +8 hostname nor servname provided, or not known +$ EAI_SERVICE +9 servname not supported for ai_socktype +$ EAI_SOCKTYPE +10 ai_socktype not supported +$ EAI_SYSTEM +11 System error returned in errno +$ EAI_BADHINTS +12 Invalid value for hints +$ EAI_PROTOCOL +13 Resolved protocol is unknown +$ EAI_OVERFLOW +14 Argument buffer overflow +$ 0 +32766 Success +$ NL_MSGMAX +32767 Unknown error ==== //depot/projects/scottl-camlock/src/lib/libc/nls/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ -# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.18 2009/09/27 13:16:38 gabor Exp $ +# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.20 2009/11/09 12:33:47 ume Exp $ .PATH: ${.CURDIR}/nls @@ -23,6 +23,8 @@ NLS+= gl_ES.ISO8859-1 NLS+= hu_HU.ISO8859-2 NLS+= it_IT.ISO8859-15 +NLS+= ja_JP.UTF-8 +NLS+= ja_JP.eucJP NLS+= ko_KR.UTF-8 NLS+= ko_KR.eucKR NLS+= mn_MN.UTF-8 ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb.h,v 1.9 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb.h,v 1.10 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * @@ -271,9 +271,11 @@ uint16_t wLength; } libusb_control_setup; +#define LIBUSB_CONTROL_SETUP_SIZE 8 /* bytes */ + typedef struct libusb_iso_packet_descriptor { - unsigned int length; - unsigned int actual_length; + uint32_t length; + uint32_t actual_length; enum libusb_transfer_status status; } libusb_iso_packet_descriptor __aligned(sizeof(void *)); @@ -282,9 +284,9 @@ typedef struct libusb_transfer { libusb_device_handle *dev_handle; uint8_t flags; - unsigned int endpoint; + uint32_t endpoint; uint8_t type; - unsigned int timeout; + uint32_t timeout; enum libusb_transfer_status status; int length; int actual_length; @@ -320,7 +322,7 @@ int libusb_set_configuration(libusb_device_handle * devh, int configuration); int libusb_claim_interface(libusb_device_handle * devh, int interface_number); int libusb_release_interface(libusb_device_handle * devh, int interface_number); -int libusb_reset_device(libusb_device_handle * dev); +int libusb_reset_device(libusb_device_handle * devh); int libusb_kernel_driver_active(libusb_device_handle * devh, int interface); int libusb_detach_kernel_driver(libusb_device_handle * devh, int interface); int libusb_attach_kernel_driver(libusb_device_handle * devh, int interface); @@ -333,7 +335,8 @@ int libusb_get_config_descriptor(libusb_device * dev, uint8_t config_index, struct libusb_config_descriptor **config); int libusb_get_config_descriptor_by_value(libusb_device * dev, uint8_t bConfigurationValue, struct libusb_config_descriptor **config); void libusb_free_config_descriptor(struct libusb_config_descriptor *config); -int libusb_get_string_descriptor_ascii(libusb_device_handle * dev, uint8_t desc_index, uint8_t *data, int length); +int libusb_get_string_descriptor_ascii(libusb_device_handle * devh, uint8_t desc_index, uint8_t *data, int length); +int libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, uint8_t desc_index, uint8_t *data, int length); /* Asynchronous device I/O */ @@ -341,7 +344,16 @@ void libusb_free_transfer(struct libusb_transfer *transfer); int libusb_submit_transfer(struct libusb_transfer *transfer); int libusb_cancel_transfer(struct libusb_transfer *transfer); -uint8_t *libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, unsigned int packet); +uint8_t *libusb_get_iso_packet_buffer(struct libusb_transfer *transfer, uint32_t index); +uint8_t *libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, uint32_t index); +void libusb_set_iso_packet_lengths(struct libusb_transfer *transfer, uint32_t length); +uint8_t *libusb_control_transfer_get_data(struct libusb_transfer *transfer); +struct libusb_control_setup *libusb_control_transfer_get_setup(struct libusb_transfer *transfer); +void libusb_fill_control_setup(uint8_t *buf, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint16_t wLength); +void libusb_fill_control_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t *buf, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout); +void libusb_fill_bulk_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout); +void libusb_fill_interrupt_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout); +void libusb_fill_iso_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, int npacket, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout); /* Polling and timing */ @@ -362,9 +374,14 @@ /* Synchronous device I/O */ -int libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength, unsigned int timeout); -int libusb_bulk_transfer(libusb_device_handle *devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, unsigned int timeout); -int libusb_interrupt_transfer(libusb_device_handle *devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, unsigned int timeout); +int libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength, uint32_t timeout); +int libusb_bulk_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout); +int libusb_interrupt_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout); + +/* Byte-order */ + +uint16_t libusb_cpu_to_le16(uint16_t x); +uint16_t libusb_le16_to_cpu(uint16_t x); #if 0 { /* indent fix */ ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. @@ -35,6 +35,7 @@ #include #include #include +#include #include "libusb20.h" #include "libusb20_desc.h" @@ -185,8 +186,6 @@ /* create libusb v1.0 compliant devices */ i = 0; while ((pdev = libusb20_be_device_foreach(usb_backend, NULL))) { - /* get device into libUSB v1.0 list */ - libusb20_be_dequeue_device(usb_backend, pdev); dev = malloc(sizeof(*dev)); if (dev == NULL) { @@ -199,6 +198,10 @@ libusb20_be_free(usb_backend); return (LIBUSB_ERROR_NO_MEM); } + + /* get device into libUSB v1.0 list */ + libusb20_be_dequeue_device(usb_backend, pdev); + memset(dev, 0, sizeof(*dev)); /* init transfer queues */ @@ -416,6 +419,8 @@ libusb10_remove_pollfd(ctx, &dev->dev_poll); libusb20_dev_close(pdev); + + /* unref will free the "pdev" when the refcount reaches zero */ libusb_unref_device(dev); /* make sure our event loop detects the closed device */ @@ -1195,7 +1200,7 @@ struct libusb20_transfer *pxfer1; struct libusb_super_transfer *sxfer; struct libusb_device *dev; - unsigned int endpoint; + uint32_t endpoint; int err; if (uxfer == NULL) @@ -1252,7 +1257,7 @@ struct libusb20_transfer *pxfer1; struct libusb_super_transfer *sxfer; struct libusb_device *dev; - unsigned int endpoint; + uint32_t endpoint; if (uxfer == NULL) return (LIBUSB_ERROR_INVALID_PARAM); @@ -1312,3 +1317,16 @@ { /* TODO */ } + +uint16_t +libusb_cpu_to_le16(uint16_t x) +{ + return (htole16(x)); +} + +uint16_t +libusb_le16_to_cpu(uint16_t x) +{ + return (le16toh(x)); +} + ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb10_desc.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * @@ -35,6 +35,8 @@ #include "libusb.h" #include "libusb10.h" +#define N_ALIGN(n) (-((-(n)) & (-8UL))) + /* USB descriptors */ int @@ -114,17 +116,17 @@ nalt = nif = pconf->num_interface; nep = 0; - nextra = pconf->extra.len; + nextra = N_ALIGN(pconf->extra.len); for (i = 0; i < nif; i++) { pinf = pconf->interface + i; - nextra += pinf->extra.len; + nextra += N_ALIGN(pinf->extra.len); nep += pinf->num_endpoints; k = pinf->num_endpoints; pend = pinf->endpoints; while (k--) { - nextra += pend->extra.len; + nextra += N_ALIGN(pend->extra.len); pend++; } @@ -132,12 +134,12 @@ nalt += pinf->num_altsetting; pinf = pinf->altsetting; while (j--) { - nextra += pinf->extra.len; + nextra += N_ALIGN(pinf->extra.len); nep += pinf->num_endpoints; k = pinf->num_endpoints; pend = pinf->endpoints; while (k--) { - nextra += pend->extra.len; + nextra += N_ALIGN(pend->extra.len); pend++; } pinf++; @@ -150,17 +152,18 @@ (nalt * sizeof(libusb_interface_descriptor)) + (nep * sizeof(libusb_endpoint_descriptor)); + nextra = N_ALIGN(nextra); + pconfd = malloc(nextra); if (pconfd == NULL) { free(pconf); return (LIBUSB_ERROR_NO_MEM); } - /* make sure memory is clean */ + /* make sure memory is initialised */ memset(pconfd, 0, nextra); - pconfd->interface = (libusb_interface *) (pconfd + - sizeof(libusb_config_descriptor)); + pconfd->interface = (libusb_interface *) (pconfd + 1); ifd = (libusb_interface_descriptor *) (pconfd->interface + nif); endd = (libusb_endpoint_descriptor *) (ifd + nalt); @@ -181,7 +184,7 @@ pconfd->extra_length = pconf->extra.len; pconfd->extra = pextra; memcpy(pextra, pconf->extra.ptr, pconfd->extra_length); - pextra += pconfd->extra_length; + pextra += N_ALIGN(pconfd->extra_length); } /* setup all interface and endpoint pointers */ @@ -221,7 +224,7 @@ ifd->extra_length = pinf->extra.len; ifd->extra = pextra; memcpy(pextra, pinf->extra.ptr, pinf->extra.len); - pextra += pinf->extra.len; + pextra += N_ALIGN(pinf->extra.len); } for (k = 0; k < pinf->num_endpoints; k++) { pend = &pinf->endpoints[k]; @@ -238,7 +241,7 @@ endd->extra_length = pend->extra.len; endd->extra = pextra; memcpy(pextra, pend->extra.ptr, pend->extra.len); - pextra += pend->extra.len; + pextra += N_ALIGN(pend->extra.len); } } } @@ -304,3 +307,12 @@ return (LIBUSB_ERROR_OTHER); } + +int +libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, + uint8_t desc_index, uint8_t *data, int length) +{ + return (libusb_control_transfer(devh, LIBUSB_ENDPOINT_IN, + LIBUSB_REQUEST_GET_DESCRIPTOR, (desc_type << 8) | desc_index, 0, data, + length, 1000)); +} ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb10_io.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * @@ -32,6 +32,7 @@ #include #include #include +#include #include "libusb20.h" #include "libusb20_desc.h" @@ -148,19 +149,19 @@ goto do_done; } for (i = 0; i != nfds; i++) { - if (fds[i].revents == 0) - continue; if (ppdev[i] != NULL) { dev = libusb_get_device(ppdev[i]); - err = libusb20_dev_process(ppdev[i]); + if (fds[i].revents == 0) + err = 0; /* nothing to do */ + else + err = libusb20_dev_process(ppdev[i]); + if (err) { /* cancel all transfers - device is gone */ libusb10_cancel_all_transfer(dev); - /* - * make sure we don't go into an infinite - * loop - */ + + /* remove USB device from polling loop */ libusb10_remove_pollfd(dev->ctx, &dev->dev_poll); } CTX_UNLOCK(ctx); @@ -573,3 +574,160 @@ DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_interrupt_transfer leave"); return (ret); } + +uint8_t * +libusb_get_iso_packet_buffer(struct libusb_transfer *transfer, uint32_t index) +{ + uint8_t *ptr; + uint32_t n; + + if (transfer->num_iso_packets < 0) + return (NULL); + + if (index >= (uint32_t)transfer->num_iso_packets) + return (NULL); + + ptr = transfer->buffer; + if (ptr == NULL) + return (NULL); + + for (n = 0; n != index; n++) { + ptr += transfer->iso_packet_desc[n].length; + } + return (ptr); +} + +uint8_t * +libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, uint32_t index) +{ + uint8_t *ptr; + + if (transfer->num_iso_packets < 0) + return (NULL); + + if (index >= (uint32_t)transfer->num_iso_packets) + return (NULL); + + ptr = transfer->buffer; + if (ptr == NULL) + return (NULL); + + ptr += transfer->iso_packet_desc[0].length * index; + + return (ptr); +} + +void +libusb_set_iso_packet_lengths(struct libusb_transfer *transfer, uint32_t length) +{ + int n; + + if (transfer->num_iso_packets < 0) + return; + + for (n = 0; n != transfer->num_iso_packets; n++) + transfer->iso_packet_desc[n].length = length; +} + +uint8_t * +libusb_control_transfer_get_data(struct libusb_transfer *transfer) +{ + if (transfer->buffer == NULL) + return (NULL); + + return (transfer->buffer + LIBUSB_CONTROL_SETUP_SIZE); +} + +struct libusb_control_setup * +libusb_control_transfer_get_setup(struct libusb_transfer *transfer) +{ + return ((struct libusb_control_setup *)transfer->buffer); +} + +void +libusb_fill_control_setup(uint8_t *buf, uint8_t bmRequestType, + uint8_t bRequest, uint16_t wValue, + uint16_t wIndex, uint16_t wLength) +{ + struct libusb_control_setup *req = (struct libusb_control_setup *)buf; + + /* The alignment is OK for all fields below. */ + req->bmRequestType = bmRequestType; + req->bRequest = bRequest; + req->wValue = htole16(wValue); + req->wIndex = htole16(wIndex); + req->wLength = htole16(wLength); +} + +void +libusb_fill_control_transfer(struct libusb_transfer *transfer, + libusb_device_handle *devh, uint8_t *buf, + libusb_transfer_cb_fn callback, void *user_data, + uint32_t timeout) +{ + struct libusb_control_setup *setup = (struct libusb_control_setup *)buf; + + transfer->dev_handle = devh; + transfer->endpoint = 0; + transfer->type = LIBUSB_TRANSFER_TYPE_CONTROL; + transfer->timeout = timeout; + transfer->buffer = buf; + if (setup != NULL) + transfer->length = LIBUSB_CONTROL_SETUP_SIZE + + le16toh(setup->wLength); + else + transfer->length = 0; + transfer->user_data = user_data; + transfer->callback = callback; + +} + +void +libusb_fill_bulk_transfer(struct libusb_transfer *transfer, + libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, + int length, libusb_transfer_cb_fn callback, void *user_data, + uint32_t timeout) +{ + transfer->dev_handle = devh; + transfer->endpoint = endpoint; + transfer->type = LIBUSB_TRANSFER_TYPE_BULK; + transfer->timeout = timeout; + transfer->buffer = buf; + transfer->length = length; + transfer->user_data = user_data; + transfer->callback = callback; +} + +void +libusb_fill_interrupt_transfer(struct libusb_transfer *transfer, + libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, + int length, libusb_transfer_cb_fn callback, void *user_data, + uint32_t timeout) +{ + transfer->dev_handle = devh; + transfer->endpoint = endpoint; + transfer->type = LIBUSB_TRANSFER_TYPE_INTERRUPT; + transfer->timeout = timeout; + transfer->buffer = buf; + transfer->length = length; + transfer->user_data = user_data; + transfer->callback = callback; +} + +void +libusb_fill_iso_transfer(struct libusb_transfer *transfer, + libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, + int length, int npacket, libusb_transfer_cb_fn callback, + void *user_data, uint32_t timeout) +{ + transfer->dev_handle = devh; + transfer->endpoint = endpoint; + transfer->type = LIBUSB_TRANSFER_TYPE_ISOCHRONOUS; + transfer->timeout = timeout; + transfer->buffer = buf; + transfer->length = length; + transfer->num_iso_packets = npacket; + transfer->user_data = user_data; + transfer->callback = callback; +} + ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.4 2009/06/12 16:07:06 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.5 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -630,6 +630,9 @@ struct LIBUSB20_CONTROL_SETUP_DECODED req; int error; + /* make sure memory is initialised */ + memset(ptr, 0, len); + if (len < 4) { /* invalid length */ return (LIBUSB20_ERROR_INVALID_PARAM); @@ -1093,7 +1096,8 @@ if (pbe->methods->exit_backend) { pbe->methods->exit_backend(pbe); } - return; + /* free backend */ + free(pbe); } void @@ -1101,7 +1105,6 @@ { pdev->beMethods = pbe->methods; /* copy backend methods */ TAILQ_INSERT_TAIL(&(pbe->usb_devs), pdev, dev_entry); - return; } void @@ -1109,5 +1112,4 @@ struct libusb20_device *pdev) { TAILQ_REMOVE(&(pbe->usb_devs), pdev, dev_entry); - return; } ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20_desc.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_desc.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_desc.c,v 1.2 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -118,6 +118,9 @@ if (lub_config == NULL) { return (NULL); /* out of memory */ } + /* make sure memory is initialised */ + memset(lub_config, 0, size); + lub_interface = (void *)(lub_config + 1); lub_alt_interface = (void *)(lub_interface + niface_no_alt); lub_endpoint = (void *)(lub_interface + niface); ==== //depot/projects/scottl-camlock/src/lib/libusb/libusb20_ugen20.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.5 2009/10/22 21:01:41 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.6 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -449,6 +449,8 @@ uint16_t len; int error; + /* make sure memory is initialised */ + memset(&cdesc, 0, sizeof(cdesc)); memset(&gen_desc, 0, sizeof(gen_desc)); gen_desc.ugd_data = &cdesc; @@ -468,6 +470,10 @@ if (!ptr) { return (LIBUSB20_ERROR_NO_MEM); } + + /* make sure memory is initialised */ + memset(ptr, 0, len); + gen_desc.ugd_data = ptr; gen_desc.ugd_maxlen = len; ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.8#9 (text+ko) ==== @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.46 2009/09/04 18:21:40 mav Exp $ +.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.47 2009/11/09 11:39:51 mav Exp $ .\" -.Dd September 4, 2009 +.Dd November 9, 2009 .Dt CAMCONTROL 8 .Os .Sh NAME @@ -165,6 +165,20 @@ .Op Fl w .Op Fl y .Nm +.Ic idle +.Op device id +.Op generic args +.Op Fl t Ar time +.Nm +.Ic standby +.Op device id +.Op generic args +.Op Fl t Ar time +.Nm +.Ic sleep +.Op device id +.Op generic args +.Nm .Ic help .Sh DESCRIPTION The @@ -821,6 +835,15 @@ will not be asked about the timeout if a timeout is specified on the command line. .El +.It Ic idle +Put ATA device into IDLE state. Optional parameter specifies automatic +idle timer value in seconds. +.It Ic standby +Put ATA device into STANDBY state. Optional parameter specifies automatic +standby timer value in seconds. +.It Ic sleep +Put ATA device into SLEEP state. Note that the only way get device out of +this state may be reset. .It Ic help Print out verbose usage information. .El ==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#29 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.67 2009/11/04 15:24:32 mav Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.69 2009/11/09 19:47:46 mav Exp $"); #include #include @@ -74,7 +74,10 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 11 12:38:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDECC106568F; Wed, 11 Nov 2009 12:38:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BBE51065670 for ; Wed, 11 Nov 2009 12:38:33 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 880D48FC14 for ; Wed, 11 Nov 2009 12:38:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABCcXDP056053 for ; Wed, 11 Nov 2009 12:38:33 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABCcXe4056051 for perforce@freebsd.org; Wed, 11 Nov 2009 12:38:33 GMT (envelope-from mav@freebsd.org) Date: Wed, 11 Nov 2009 12:38:33 GMT Message-Id: <200911111238.nABCcXe4056051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 12:38:35 -0000 http://p4web.freebsd.org/chv.cgi?CH=170478 Change 170478 by mav@mav_mavbook on 2009/11/11 12:37:58 IFC Affected files ... .. //depot/projects/scottl-camlock/src/lib/libc/locale/isblank.3#4 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.SJIS.src#4 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#4 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.eucJP.src#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#43 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#56 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#31 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#125 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#42 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#54 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#36 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#78 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#19 integrate Differences ... ==== //depot/projects/scottl-camlock/src/lib/libc/locale/isblank.3#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isblank.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.25 2009/09/04 07:44:58 des Exp $ +.\" $FreeBSD: src/lib/libc/locale/isblank.3,v 1.26 2009/11/11 11:31:02 roam Exp $ .\" .Dd July 17, 2005 .Dt ISBLANK 3 @@ -50,9 +50,9 @@ .It "\&``\et''\t`` ''" .El .Pp -In the "C" locale +In the "C" locale, a successful .Fn isblank -successful test is limited to this characters only. +test is limited to these characters only. The value of the argument must be representable as an .Vt "unsigned char" or the value of ==== //depot/projects/scottl-camlock/src/share/timedef/ja_JP.SJIS.src#4 (text+ko) ==== @@ -1,22 +1,22 @@ -# $FreeBSD: src/share/timedef/ja_JP.SJIS.src,v 1.15 2009/06/09 22:33:34 edwin Exp $ +# $FreeBSD: src/share/timedef/ja_JP.SJIS.src,v 1.16 2009/11/11 11:24:02 ume Exp $ # # WARNING: spaces may be essential at the end of lines # WARNING: empty lines are essential too # # Short month names # - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 +10 +11 +12 # # Long month names (as in a date) # ==== //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#4 (text+ko) ==== @@ -1,21 +1,21 @@ -# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.4 2009/08/30 10:47:00 ume Exp $ +# $FreeBSD: src/share/timedef/ja_JP.UTF-8.src,v 1.5 2009/11/11 11:24:02 ume Exp $ # # WARNING: spaces may be essential at the end of lines # WARNING: empty lines are essential too # # Short month names - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1月 + 2月 + 3月 + 4月 + 5月 + 6月 + 7月 + 8月 + 9月 +10月 +11月 +12月 # # Long month names (as in a date) # ==== //depot/projects/scottl-camlock/src/share/timedef/ja_JP.eucJP.src#4 (text+ko) ==== @@ -1,21 +1,21 @@ -# $FreeBSD: src/share/timedef/ja_JP.eucJP.src,v 1.13 2009/06/09 22:33:34 edwin Exp $ +# $FreeBSD: src/share/timedef/ja_JP.eucJP.src,v 1.14 2009/11/11 11:24:02 ume Exp $ # # WARNING: spaces may be essential at the end of lines # WARNING: empty lines are essential too # # Short month names - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 -10 -11 -12 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 +10 +11 +12 # # Long month names (as in a date) # ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#22 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.6 2009/11/04 16:16:50 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_all.c,v 1.7 2009/11/11 11:10:36 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.h#22 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.5 2009/11/04 16:37:13 mav Exp $ + * $FreeBSD: src/sys/cam/ata/ata_all.h,v 1.6 2009/11/11 11:10:36 mav Exp $ */ #ifndef CAM_ATA_ALL_H ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#43 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.10 2009/11/04 15:40:19 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_da.c,v 1.11 2009/11/11 11:10:36 mav Exp $"); #include ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#56 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.12 2009/11/04 15:24:32 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/ata/ata_xpt.c,v 1.13 2009/11/11 11:10:36 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.14 2009/11/03 11:19:05 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.15 2009/11/11 11:10:36 mav Exp $"); #include #ifdef _KERNEL ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#31 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.39 2009/10/31 10:43:38 mav Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.40 2009/11/11 11:10:36 mav Exp $ */ #ifndef _CAM_CAM_CCB_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#125 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.233 2009/11/04 15:40:19 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.234 2009/11/11 11:10:36 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#15 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt_internal.h,v 1.4 2009/11/01 11:31:06 mav Exp $ + * $FreeBSD: src/sys/cam/cam_xpt_internal.h,v 1.5 2009/11/11 11:10:36 mav Exp $ */ #ifndef _CAM_CAM_XPT_INTERNAL_H ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#25 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.6 2009/11/01 11:31:06 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_xpt.c,v 1.7 2009/11/11 11:10:36 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/conf/NOTES#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1562 2009/11/10 22:07:37 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1563 2009/11/11 11:07:30 ru Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -706,6 +706,7 @@ options NETGRAPH_TEE options NETGRAPH_UI options NETGRAPH_VJC +options NETGRAPH_VLAN # NgATM - Netgraph ATM options NGATM_ATM ==== //depot/projects/scottl-camlock/src/sys/conf/files#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1481 2009/11/09 15:59:09 rpaulo Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1482 2009/11/11 11:07:30 ru Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2399,6 +2399,7 @@ netgraph/ng_tee.c optional netgraph_tee netgraph/ng_tty.c optional netgraph_tty netgraph/ng_vjc.c optional netgraph_vjc +netgraph/ng_vlan.c optional netgraph_vlan netinet/accf_data.c optional accept_filter_data inet netinet/accf_dns.c optional accept_filter_dns inet netinet/accf_http.c optional accept_filter_http inet ==== //depot/projects/scottl-camlock/src/sys/conf/options#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.694 2009/11/08 14:33:19 mav Exp $ +# $FreeBSD: src/sys/conf/options,v 1.695 2009/11/11 11:07:30 ru Exp $ # # On the handling of kernel options # @@ -498,6 +498,7 @@ NETGRAPH_TTY opt_netgraph.h NETGRAPH_UI opt_netgraph.h NETGRAPH_VJC opt_netgraph.h +NETGRAPH_VLAN opt_netgraph.h # NgATM options NGATM_ATM opt_netgraph.h ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#78 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.11 2009/11/03 11:47:07 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.13 2009/11/11 11:10:36 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.9 2009/11/10 09:46:52 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/siis/siis.c,v 1.10 2009/11/11 11:10:36 mav Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Wed Nov 11 16:19:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A1AF106568F; Wed, 11 Nov 2009 16:19: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 1D5C81065679 for ; Wed, 11 Nov 2009 16:19:15 +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 0A1DD8FC14 for ; Wed, 11 Nov 2009 16:19:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABGJFWW086519 for ; Wed, 11 Nov 2009 16:19:15 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABGJEKm086517 for perforce@freebsd.org; Wed, 11 Nov 2009 16:19:14 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 11 Nov 2009 16:19:14 GMT Message-Id: <200911111619.nABGJEKm086517@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 16:19:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=170487 Change 170487 by pgj@beehive on 2009/11/11 16:18:36 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#35 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#19 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/roam.key#2 integrate .. //depot/projects/docproj_hu/www/en/internal/doceng.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/internal/machines.sgml#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#17 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.software.xml#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#73 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#35 (text+ko) ==== @@ -1,7 +1,7 @@ + uid Peter Pentchev uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev sub 1024g/7074473C 2002-02-01 + +pub 4096R/2527DF13 2009-10-16 + Key fingerprint = 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13 +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +sub 4096R/D0B337AA 2009-10-16 ]]> >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 11 16:33:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B396F1065670; Wed, 11 Nov 2009 16:33:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78099106566B for ; Wed, 11 Nov 2009 16:33:29 +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 65BA08FC0A for ; Wed, 11 Nov 2009 16:33:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABGXTO4087576 for ; Wed, 11 Nov 2009 16:33:29 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABGXTmE087574 for perforce@freebsd.org; Wed, 11 Nov 2009 16:33:29 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 11 Nov 2009 16:33:29 GMT Message-Id: <200911111633.nABGXTmE087574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 16:33:29 -0000 http://p4web.freebsd.org/chv.cgi?CH=170488 Change 170488 by pgj@beehive on 2009/11/11 16:32:38 MFen (www): 1.77 -> 1.78 hu/share/sgml/events.xml 1.275 -> 1.276 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#21 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#60 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#21 (text+ko) ==== @@ -11,7 +11,7 @@ @@ -143,7 +143,7 @@ BSDCan 2010 - http://www.bsdcan.org/ + http://www.bsdcan.org/2010/ 2010 5 ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#60 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -287,6 +287,16 @@ teljesítésében!

 + + + 3 + + +

Új bugmeisterek: + Gavin Atkinson, + Volker Werth

+ + From owner-p4-projects@FreeBSD.ORG Wed Nov 11 18:32:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9CD3106568F; Wed, 11 Nov 2009 18:32:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94DFC106566C for ; Wed, 11 Nov 2009 18:32:29 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 812508FC21 for ; Wed, 11 Nov 2009 18:32:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABIWTA8008611 for ; Wed, 11 Nov 2009 18:32:29 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABIWTWW008609 for perforce@freebsd.org; Wed, 11 Nov 2009 18:32:29 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 11 Nov 2009 18:32:29 GMT Message-Id: <200911111832.nABIWTWW008609@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 Precedence: bulk Cc: Subject: PERFORCE change 170496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 18:32:30 -0000 http://p4web.freebsd.org/chv.cgi?CH=170496 Change 170496 by rene@rene_self on 2009/11/11 18:32:20 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#37 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/share/pgpkeys/roam.key#2 integrate .. //depot/projects/docproj_nl/www/en/internal/doceng.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/internal/machines.sgml#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#14 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#4 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#55 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#37 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -77,10 +77,10 @@ - &man.chroot.2; (command) + &man.chroot.8; (command) - A system call of &os;, which changes the root directory of a - process and all its descendants. + Utility, which uses &man.chroot.2; &os; system call to change + the root directory of a process and all its descendants. ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/virtualization/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ + uid Peter Pentchev uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev sub 1024g/7074473C 2002-02-01 + +pub 4096R/2527DF13 2009-10-16 + Key fingerprint = 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13 +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +uid Peter Pentchev +sub 4096R/D0B337AA 2009-10-16 ]]> >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 11 18:44:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A349F1065676; Wed, 11 Nov 2009 18:44: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 68016106566C for ; Wed, 11 Nov 2009 18:44:42 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4B9038FC1A for ; Wed, 11 Nov 2009 18:44:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABIifrJ009505 for ; Wed, 11 Nov 2009 18:44:41 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABIifE3009503 for perforce@freebsd.org; Wed, 11 Nov 2009 18:44:41 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 11 Nov 2009 18:44:41 GMT Message-Id: <200911111844.nABIifE3009503@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 Precedence: bulk Cc: Subject: PERFORCE change 170498 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 18:44:42 -0000 http://p4web.freebsd.org/chv.cgi?CH=170498 Change 170498 by rene@rene_self on 2009/11/11 18:44:20 MFen handbook/jails 1.18 -> 1.19 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#15 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml#15 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/jails/chapter.sgml,v 1.4 2009/06/10 06:34:09 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/jails/chapter.sgml - %SRCID% 1.18 + %SRCID% 1.19 --> @@ -89,10 +89,11 @@ - &man.chroot.2; (commando) + &man.chroot.8; (commando) - Een systeem aanroep van &os;, welke de root - directory van een proces en al zijn kinderen wijzigt. + Hulpmiddel dat de systeemaanroep &man.chroot.2; van &os; + gebruikt om de rootmap van een proces en alle afstammelingen te + veranderen. From owner-p4-projects@FreeBSD.ORG Wed Nov 11 19:45:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFD751065670; Wed, 11 Nov 2009 19:45:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3C9B106566B for ; Wed, 11 Nov 2009 19:45:43 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A14B78FC13 for ; Wed, 11 Nov 2009 19:45:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABJjh3t014972 for ; Wed, 11 Nov 2009 19:45:43 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABJjhEc014970 for perforce@freebsd.org; Wed, 11 Nov 2009 19:45:43 GMT (envelope-from mav@freebsd.org) Date: Wed, 11 Nov 2009 19:45:43 GMT Message-Id: <200911111945.nABJjhEc014970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 19:45:44 -0000 http://p4web.freebsd.org/chv.cgi?CH=170503 Change 170503 by mav@mav_mavbook on 2009/11/11 19:45:37 Remove unused variable qfrozen_cnt. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#42 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#42 (text+ko) ==== @@ -985,7 +985,6 @@ int sense; struct scsi_start_stop_unit *scsi_cmd; u_int32_t relsim_flags, timeout; - u_int32_t qfrozen_cnt; int xpt_done_ccb; xpt_done_ccb = FALSE; @@ -1002,11 +1001,11 @@ * Unfreeze the queue once if it is already frozen.. */ if (frozen != 0) { - qfrozen_cnt = cam_release_devq(done_ccb->ccb_h.path, - /*relsim_flags*/0, - /*openings*/0, - /*timeout*/0, - /*getcount_only*/0); + cam_release_devq(done_ccb->ccb_h.path, + /*relsim_flags*/0, + /*openings*/0, + /*timeout*/0, + /*getcount_only*/0); } switch (status) { @@ -1186,11 +1185,11 @@ if (done_ccb->ccb_h.retry_count > 0) done_ccb->ccb_h.retry_count--; - qfrozen_cnt = cam_release_devq(done_ccb->ccb_h.path, - /*relsim_flags*/relsim_flags, - /*openings*/0, - /*timeout*/timeout, - /*getcount_only*/0); + cam_release_devq(done_ccb->ccb_h.path, + /*relsim_flags*/relsim_flags, + /*openings*/0, + /*timeout*/timeout, + /*getcount_only*/0); if (xpt_done_ccb == TRUE) (*done_ccb->ccb_h.cbfcnp)(periph, done_ccb); } From owner-p4-projects@FreeBSD.ORG Wed Nov 11 19:59:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 842271065698; Wed, 11 Nov 2009 19:59:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48E5E106568F for ; Wed, 11 Nov 2009 19:59:58 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36B4A8FC16 for ; Wed, 11 Nov 2009 19:59:58 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABJxvPH015883 for ; Wed, 11 Nov 2009 19:59:57 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABJxvMV015881 for perforce@freebsd.org; Wed, 11 Nov 2009 19:59:57 GMT (envelope-from mav@freebsd.org) Date: Wed, 11 Nov 2009 19:59:57 GMT Message-Id: <200911111959.nABJxvMV015881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 19:59:58 -0000 http://p4web.freebsd.org/chv.cgi?CH=170504 Change 170504 by mav@mav_mavbook on 2009/11/11 19:59:13 Unify code a bit. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#126 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#126 (text+ko) ==== @@ -3273,16 +3273,13 @@ devq->send_queue.qfrozen_cnt++; while ((devq->send_queue.entries > 0) - && (devq->send_openings > 0)) { + && (devq->send_openings > 0) + && (devq->send_queue.qfrozen_cnt <= 1)) { struct cam_ed_qinfo *qinfo; struct cam_ed *device; union ccb *work_ccb; struct cam_sim *sim; - if (devq->send_queue.qfrozen_cnt > 1) { - break; - } - qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->send_queue, CAMQ_HEAD); device = qinfo->device; From owner-p4-projects@FreeBSD.ORG Wed Nov 11 20:05:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D7501065679; Wed, 11 Nov 2009 20:05:04 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D30B0106566C for ; Wed, 11 Nov 2009 20:05: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 BE6E68FC15 for ; Wed, 11 Nov 2009 20:05:03 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nABK53Rs017269 for ; Wed, 11 Nov 2009 20:05:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nABK535M017263 for perforce@freebsd.org; Wed, 11 Nov 2009 20:05:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 11 Nov 2009 20:05:03 GMT Message-Id: <200911112005.nABK535M017263@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2009 20:05:04 -0000 http://p4web.freebsd.org/chv.cgi?CH=170505 Change 170505 by hselasky@hselasky_laptop001 on 2009/11/11 20:04:37 IFC @ 170502 Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.h#11 integrate .. //depot/projects/usb/src/lib/libusb/libusb10.c#15 integrate .. //depot/projects/usb/src/lib/libusb/libusb10_desc.c#11 integrate .. //depot/projects/usb/src/lib/libusb/libusb10_io.c#11 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.c#9 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_desc.c#5 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#11 integrate .. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#18 integrate .. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#9 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#25 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#33 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#19 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#14 integrate .. //depot/projects/usb/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/db_trace.c#4 integrate .. //depot/projects/usb/src/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/usb/src/sys/arm/arm/machdep.c#11 integrate .. //depot/projects/usb/src/sys/arm/arm/trap.c#9 integrate .. //depot/projects/usb/src/sys/arm/arm/vm_machdep.c#12 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#9 integrate .. //depot/projects/usb/src/sys/arm/sa11x0/assabet_machdep.c#10 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/glue.c#5 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_all.c#4 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_all.h#3 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_da.c#7 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#6 integrate .. //depot/projects/usb/src/sys/cam/cam.c#5 integrate .. //depot/projects/usb/src/sys/cam/cam.h#5 integrate .. //depot/projects/usb/src/sys/cam/cam_ccb.h#9 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#14 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.h#6 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#25 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt_internal.h#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#17 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_xpt.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#10 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ipc.c#6 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#15 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#9 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_hal.c#5 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#18 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#13 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_pe.c#4 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#18 integrate .. //depot/projects/usb/src/sys/conf/NOTES#49 integrate .. //depot/projects/usb/src/sys/conf/files#85 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#14 integrate .. //depot/projects/usb/src/sys/conf/options#42 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_hfsc.c#5 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#24 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#14 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#10 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#13 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#6 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.h#4 integrate .. //depot/projects/usb/src/sys/dev/an/if_an.c#8 integrate .. //depot/projects/usb/src/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/usb/src/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/usb/src/sys/dev/an/if_an_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/an/if_anreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#11 integrate .. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.h#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#16 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#17 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#23 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#16 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#8 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#33 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#23 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#12 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#24 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#15 integrate .. //depot/projects/usb/src/sys/dev/fb/vesa.c#5 integrate .. //depot/projects/usb/src/sys/dev/fb/vgareg.h#3 integrate .. //depot/projects/usb/src/sys/dev/fdc/fdc.c#11 integrate .. //depot/projects/usb/src/sys/dev/hatm/if_hatm.c#3 integrate .. //depot/projects/usb/src/sys/dev/hptrr/hptrr_osm_bsd.c#3 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#10 integrate .. //depot/projects/usb/src/sys/dev/ieee488/ibfoo.c#3 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#34 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#22 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_sbus.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#14 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/usb/src/sys/dev/mii/miidevs#15 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#17 integrate .. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#12 integrate .. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#12 integrate .. //depot/projects/usb/src/sys/dev/patm/if_patm_attach.c#3 integrate .. //depot/projects/usb/src/sys/dev/pci/vga_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#23 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.c#6 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.h#2 integrate .. //depot/projects/usb/src/sys/dev/sk/if_sk.c#11 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#59 integrate .. //depot/projects/usb/src/sys/dev/stge/if_stge.c#9 integrate .. //depot/projects/usb/src/sys/dev/sym/sym_hipd.c#9 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#10 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#18 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#44 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#15 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/input/atp.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#37 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#38 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#53 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#25 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#31 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#173 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#15 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#11 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#11 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vgevar.h#2 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#15 integrate .. //depot/projects/usb/src/sys/fs/fifofs/fifo_vnops.c#16 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#12 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#15 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate .. //depot/projects/usb/src/sys/gnu/fs/ext2fs/ext2_vnops.c#11 integrate .. //depot/projects/usb/src/sys/i386/i386/identcpu.c#16 integrate .. //depot/projects/usb/src/sys/i386/i386/initcpu.c#10 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#29 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#16 integrate .. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#15 integrate .. //depot/projects/usb/src/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#16 integrate .. //depot/projects/usb/src/sys/ia64/ia64/highfp.c#1 branch .. //depot/projects/usb/src/sys/ia64/ia64/interrupt.c#10 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#14 integrate .. //depot/projects/usb/src/sys/ia64/ia64/trap.c#8 integrate .. //depot/projects/usb/src/sys/ia64/ia64/vm_machdep.c#5 integrate .. //depot/projects/usb/src/sys/ia64/include/md_var.h#6 integrate .. //depot/projects/usb/src/sys/ia64/include/proc.h#2 integrate .. //depot/projects/usb/src/sys/isa/vga_isa.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_idle.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#21 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#20 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#12 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#20 integrate .. //depot/projects/usb/src/sys/kern/subr_log.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_prf.c#10 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/usb/src/sys/kern/vfs_acl.c#8 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#16 integrate .. //depot/projects/usb/src/sys/kern/vfs_lookup.c#21 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#31 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#24 integrate .. //depot/projects/usb/src/sys/mips/include/pcb.h#2 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#8 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#14 integrate .. //depot/projects/usb/src/sys/mips/mips/trap.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/vm_machdep.c#2 integrate .. //depot/projects/usb/src/sys/modules/ichwd/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#24 integrate .. //depot/projects/usb/src/sys/modules/usb/atp/Makefile#1 branch .. //depot/projects/usb/src/sys/net/if_ef.c#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#30 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_action.c#4 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#17 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#21 integrate .. //depot/projects/usb/src/sys/netgraph/ng_eiface.c#16 integrate .. //depot/projects/usb/src/sys/netgraph/ng_fec.c#6 integrate .. //depot/projects/usb/src/sys/netgraph/ng_iface.c#19 integrate .. //depot/projects/usb/src/sys/netgraph/ng_sppp.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#18 integrate .. //depot/projects/usb/src/sys/netinet/ip_ipsec.h#5 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#30 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#4 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#21 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#27 integrate .. //depot/projects/usb/src/sys/pc98/cbus/scterm-sck.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/aim/copyinout.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/aim/swtch.S#7 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/aim/vm_machdep.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/booke/trap.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/booke/vm_machdep.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#12 integrate .. //depot/projects/usb/src/sys/rpc/clnt_vc.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/include/pcb.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#10 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/trap.c#7 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/usb/src/sys/sys/ata.h#8 integrate .. //depot/projects/usb/src/sys/sys/fbio.h#2 integrate .. //depot/projects/usb/src/sys/sys/mman.h#4 integrate .. //depot/projects/usb/src/sys/sys/msgbuf.h#3 integrate .. //depot/projects/usb/src/sys/sys/proc.h#23 integrate .. //depot/projects/usb/src/sys/sys/signalvar.h#7 integrate .. //depot/projects/usb/src/sys/teken/teken.c#4 integrate .. //depot/projects/usb/src/sys/teken/teken.h#4 integrate .. //depot/projects/usb/src/sys/teken/teken_subr.h#4 integrate .. //depot/projects/usb/src/sys/vm/swap_pager.c#18 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#19 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#22 integrate .. //depot/projects/usb/src/sys/vm/vm_zeroidle.c#10 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#16 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#7 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb.h,v 1.9 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb.h,v 1.10 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb10.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/lib/libusb/libusb10_desc.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_desc.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.3 2009/07/30 00:11:41 alfred Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.4 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.4 2009/06/12 16:07:06 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.5 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20_desc.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_desc.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_desc.c,v 1.2 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.5 2009/10/22 21:01:41 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.6 2009/11/08 20:03:52 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.27 2009/10/08 17:41:53 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.28 2009/11/04 22:39:18 jkim Exp $"); #include #include @@ -65,9 +65,9 @@ extern int acpi_reset_video; #ifdef SMP -extern struct xpcb *stopxpcbs; +extern struct xpcb **stopxpcbs; #else -static struct xpcb *stopxpcbs; +static struct xpcb **stopxpcbs; #endif int acpi_restorecpu(struct xpcb *, vm_offset_t); @@ -104,10 +104,10 @@ int apic_id = cpu_apic_ids[cpu]; int ms; - WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[cpu]); - WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu].xpcb_gdt.rd_limit); + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, stopxpcbs[cpu]); + WAKECODE_FIXUP(wakeup_gdt, uint16_t, stopxpcbs[cpu]->xpcb_gdt.rd_limit); WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, - stopxpcbs[cpu].xpcb_gdt.rd_base); + stopxpcbs[cpu]->xpcb_gdt.rd_base); WAKECODE_FIXUP(wakeup_cpu, int, cpu); /* do an INIT IPI: assert RESET */ @@ -245,8 +245,8 @@ cr3 = rcr3(); load_cr3(KPML4phys); - stopfpu = &stopxpcbs[0].xpcb_pcb.pcb_save; - if (acpi_savecpu(&stopxpcbs[0])) { + stopfpu = &stopxpcbs[0]->xpcb_pcb.pcb_save; + if (acpi_savecpu(stopxpcbs[0])) { fpugetregs(curthread, stopfpu); #ifdef SMP @@ -261,11 +261,11 @@ WAKECODE_FIXUP(resume_beep, uint8_t, (acpi_resume_beep != 0)); WAKECODE_FIXUP(reset_video, uint8_t, (acpi_reset_video != 0)); - WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, &stopxpcbs[0]); + WAKECODE_FIXUP(wakeup_xpcb, struct xpcb *, stopxpcbs[0]); WAKECODE_FIXUP(wakeup_gdt, uint16_t, - stopxpcbs[0].xpcb_gdt.rd_limit); + stopxpcbs[0]->xpcb_gdt.rd_limit); WAKECODE_FIXUP(wakeup_gdt + 2, uint64_t, - stopxpcbs[0].xpcb_gdt.rd_base); + stopxpcbs[0]->xpcb_gdt.rd_base); WAKECODE_FIXUP(wakeup_cpu, int, 0); /* Call ACPICA to enter the desired sleep state */ @@ -320,6 +320,7 @@ acpi_alloc_wakeup_handler(void) { void *wakeaddr; + int i; /* * Specify the region for our wakeup code. We want it in the low 1 MB @@ -334,12 +335,9 @@ printf("%s: can't alloc wake memory\n", __func__); return (NULL); } - stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_NOWAIT); - if (stopxpcbs == NULL) { - contigfree(wakeaddr, 4 * PAGE_SIZE, M_DEVBUF); - printf("%s: can't alloc CPU state memory\n", __func__); - return (NULL); - } + stopxpcbs = malloc(mp_ncpus * sizeof(*stopxpcbs), M_DEVBUF, M_WAITOK); + for (i = 0; i < mp_ncpus; i++) + stopxpcbs[i] = malloc(sizeof(**stopxpcbs), M_DEVBUF, M_WAITOK); return (wakeaddr); } ==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#18 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.177 2009/11/05 14:34:38 attilio Exp $"); #include "opt_cpu.h" @@ -607,6 +607,21 @@ printf(", %d lines/tag", (regs[2] >> 8) & 0x0f); print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } + + /* + * Opteron Rev E shows a bug as in very rare occasions a read memory + * barrier is not performed as expected if it is followed by a + * non-atomic read-modify-write instruction. + * As long as that bug pops up very rarely (intensive machine usage + * on other operating systems generally generates one unexplainable + * crash any 2 months) and as long as a model specific fix would be + * impratical at this stage, print out a warning string if the broken + * model and family are identified. + */ + if (CPUID_TO_FAMILY(cpu_id) == 0xf && CPUID_TO_MODEL(cpu_id) >= 0x20 && + CPUID_TO_MODEL(cpu_id) <= 0x3f) + printf("WARNING: This architecture revision has known SMP " + "hardware bugs which may cause random instability\n"); } static void ==== //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.56 2009/10/01 12:52:48 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.57 2009/11/09 02:54:16 kuriyama Exp $"); #include "opt_cpu.h" @@ -47,6 +47,13 @@ static int hw_instruction_sse; SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD, &hw_instruction_sse, 0, "SIMD/MMX2 instructions available in CPU"); +/* + * -1: automatic (default) + * 0: keep enable CLFLUSH + * 1: force disable CLFLUSH + */ +static int hw_clflush_disable = -1; +TUNABLE_INT("hw.clflush_disable", &hw_clflush_disable); int cpu; /* Are we 386, 386sx, 486, etc? */ u_int cpu_feature; /* Feature flags */ @@ -169,6 +176,16 @@ * XXXKIB: (temporary) hack to work around traps generated when * CLFLUSHing APIC registers window. */ - if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS)) + TUNABLE_INT_FETCH("hw.clflush_disable", &hw_clflush_disable); + if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS) && + hw_clflush_disable == -1) + cpu_feature &= ~CPUID_CLFSH; + /* + * Allow to disable CLFLUSH feature manually by + * hw.clflush_disable tunable. This may help Xen guest on some AMD + * CPUs. + */ + if (hw_clflush_disable == 1) { cpu_feature &= ~CPUID_CLFSH; + } } ==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.310 2009/08/13 17:09:45 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.311 2009/11/04 22:39:18 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -105,7 +105,7 @@ extern pt_entry_t *SMPpt; struct pcb stoppcbs[MAXCPU]; -struct xpcb *stopxpcbs = NULL; +struct xpcb **stopxpcbs = NULL; /* Variables needed for SMP tlb shootdown. */ vm_offset_t smp_tlb_addr1; @@ -1256,8 +1256,8 @@ rf = intr_disable(); cr3 = rcr3(); - stopfpu = &stopxpcbs[cpu].xpcb_pcb.pcb_save; - if (savectx2(&stopxpcbs[cpu])) { + stopfpu = &stopxpcbs[cpu]->xpcb_pcb.pcb_save; + if (savectx2(stopxpcbs[cpu])) { fpugetregs(curthread, stopfpu); wbinvd(); atomic_set_int(&stopped_cpus, cpumask); ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#33 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.675 2009/10/21 18:38:02 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.676 2009/11/11 14:21:31 avg Exp $"); /* * Manages physical address maps. @@ -183,7 +183,7 @@ SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); static int pg_ps_enabled = 1; -SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0, +SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN, &pg_ps_enabled, 0, "Are large page mappings enabled?"); static u_int64_t KPTphys; /* phys addr of kernel level 1 */ ==== //depot/projects/usb/src/sys/amd64/amd64/trap.c#19 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.336 2009/09/24 14:26:42 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.337 2009/11/10 11:43:07 kib Exp $"); /* * AMD64 Trap and System call handling @@ -1007,39 +1007,7 @@ #endif } - switch (error) { - case 0: - frame->tf_rax = td->td_retval[0]; - frame->tf_rdx = td->td_retval[1]; - frame->tf_rflags &= ~PSL_C; - break; - - case ERESTART: - /* - * Reconstruct pc, we know that 'syscall' is 2 bytes. - * We have to do a full context restore so that %r10 - * (which was holding the value of %rcx) is restored for - * the next iteration. - */ - frame->tf_rip -= frame->tf_err; - frame->tf_r10 = frame->tf_rcx; - td->td_pcb->pcb_flags |= PCB_FULLCTX; - break; - - case EJUSTRETURN: - break; - - default: - if (p->p_sysent->sv_errsize) { - if (error >= p->p_sysent->sv_errsize) - error = -1; /* XXX */ - else - error = p->p_sysent->sv_errtbl[error]; - } - frame->tf_rax = error; - frame->tf_rflags |= PSL_C; - break; - } + cpu_set_syscall_retval(td, error); /* * Traced syscall. ==== //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#14 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.264 2009/07/09 09:34:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.265 2009/11/10 11:43:07 kib Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -317,6 +317,45 @@ cpu_thread_clean(td); } +void +cpu_set_syscall_retval(struct thread *td, int error) +{ + + switch (error) { + case 0: + td->td_frame->tf_rax = td->td_retval[0]; + td->td_frame->tf_rdx = td->td_retval[1]; + td->td_frame->tf_rflags &= ~PSL_C; + break; + + case ERESTART: + /* + * Reconstruct pc, we know that 'syscall' is 2 bytes. + * We have to do a full context restore so that %r10 + * (which was holding the value of %rcx) is restored + * for the next iteration. + */ + td->td_frame->tf_rip -= td->td_frame->tf_err; + td->td_frame->tf_r10 = td->td_frame->tf_rcx; + td->td_pcb->pcb_flags |= PCB_FULLCTX; + break; + + case EJUSTRETURN: + break; + + default: + if (td->td_proc->p_sysent->sv_errsize) { + if (error >= td->td_proc->p_sysent->sv_errsize) + error = -1; /* XXX */ + else + error = td->td_proc->p_sysent->sv_errtbl[error]; + } + td->td_frame->tf_rax = error; + td->td_frame->tf_rflags |= PSL_C; + break; + } +} + /* * Initialize machine state (pcb and trap frame) for a new thread about to * upcall. Put enough state in the new thread's PCB to get it to go back ==== //depot/projects/usb/src/sys/amd64/isa/isa_dma.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.22 2005/05/14 10:14:56 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa_dma.c,v 1.23 2009/11/09 20:29:10 rdivacky Exp $"); /* * code to manage AT bus @@ -71,6 +71,8 @@ static u_int8_t dma_busy = 0; /* Used in isa_dmastart() */ static u_int8_t dma_inuse = 0; /* User for acquire/release */ static u_int8_t dma_auto_mode = 0; +static struct mtx isa_dma_lock; +MTX_SYSINIT(isa_dma_lock, &isa_dma_lock, "isa DMA lock", MTX_DEF); #define VALID_DMA_MASK (7) @@ -84,39 +86,56 @@ isa_dma_init(int chan, u_int bouncebufsize, int flag) { void *buf; - - /* - * If a DMA channel is shared, both drivers have to call isa_dma_init - * since they don't know that the other driver will do it. - * Just return if we're already set up good. - * XXX: this only works if they agree on the bouncebuf size. This - * XXX: is typically the case since they are multiple instances of - * XXX: the same driver. - */ - if (dma_bouncebuf[chan] != NULL) - return (0); + int contig; #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) panic("isa_dma_init: channel out of range"); #endif - dma_bouncebufsize[chan] = bouncebufsize; /* Try malloc() first. It works better if it works. */ buf = malloc(bouncebufsize, M_DEVBUF, flag); if (buf != NULL) { - if (isa_dmarangecheck(buf, bouncebufsize, chan) == 0) { - dma_bouncebuf[chan] = buf; - return (0); + if (isa_dmarangecheck(buf, bouncebufsize, chan) != 0) { + free(buf, M_DEVBUF); + buf = NULL; } - free(buf, M_DEVBUF); + contig = 0; } - buf = contigmalloc(bouncebufsize, M_DEVBUF, flag, 0ul, 0xfffffful, + + if (buf == NULL) { + buf = contigmalloc(bouncebufsize, M_DEVBUF, flag, 0ul, 0xfffffful, 1ul, chan & 4 ? 0x20000ul : 0x10000ul); + contig = 1; + } + if (buf == NULL) return (ENOMEM); + + mtx_lock(&isa_dma_lock); + /* + * If a DMA channel is shared, both drivers have to call isa_dma_init + * since they don't know that the other driver will do it. + * Just return if we're already set up good. + * XXX: this only works if they agree on the bouncebuf size. This + * XXX: is typically the case since they are multiple instances of + * XXX: the same driver. + */ + if (dma_bouncebuf[chan] != NULL) { + if (contig) + contigfree(buf, bouncebufsize, M_DEVBUF); + else + free(buf, M_DEVBUF); + mtx_unlock(&isa_dma_lock); + return (0); + } + + dma_bouncebufsize[chan] = bouncebufsize; dma_bouncebuf[chan] = buf; + + mtx_unlock(&isa_dma_lock); + return (0); } @@ -133,12 +152,15 @@ panic("isa_dma_acquire: channel out of range"); #endif + mtx_lock(&isa_dma_lock); if (dma_inuse & (1 << chan)) { printf("isa_dma_acquire: channel %d already in use\n", chan); + mtx_unlock(&isa_dma_lock); return (EBUSY); } dma_inuse |= (1 << chan); dma_auto_mode &= ~(1 << chan); + mtx_unlock(&isa_dma_lock); return (0); } @@ -155,8 +177,11 @@ if (chan & ~VALID_DMA_MASK) panic("isa_dma_release: channel out of range"); + mtx_lock(&isa_dma_lock); if ((dma_inuse & (1 << chan)) == 0) printf("isa_dma_release: channel %d not in use\n", chan); +#else + mtx_lock(&isa_dma_lock); #endif if (dma_busy & (1 << chan)) { @@ -171,6 +196,8 @@ dma_inuse &= ~(1 << chan); dma_auto_mode &= ~(1 << chan); + + mtx_unlock(&isa_dma_lock); } /* @@ -186,6 +213,7 @@ panic("isa_dmacascade: channel out of range"); #endif + mtx_lock(&isa_dma_lock); /* set dma channel mode, and set dma channel mode */ if ((chan & 4) == 0) { outb(DMA1_MODE, DMA37MD_CASCADE | chan); @@ -194,6 +222,7 @@ outb(DMA2_MODE, DMA37MD_CASCADE | (chan & 3)); outb(DMA2_SMSK, chan & 3); } + mtx_unlock(&isa_dma_lock); } /* @@ -206,8 +235,11 @@ vm_paddr_t phys; int waport; caddr_t newaddr; + int dma_range_checked; - GIANT_REQUIRED; + /* translate to physical */ + phys = pmap_extract(kernel_pmap, (vm_offset_t)addr); + dma_range_checked = isa_dmarangecheck(addr, nbytes, chan); #ifdef DIAGNOSTIC if (chan & ~VALID_DMA_MASK) @@ -217,8 +249,11 @@ || (chan >= 4 && (nbytes > (1<<17) || (uintptr_t)addr & 1))) panic("isa_dmastart: impossible request"); + mtx_lock(&isa_dma_lock); if ((dma_inuse & (1 << chan)) == 0) printf("isa_dmastart: channel %d not acquired\n", chan); +#else + mtx_lock(&isa_dma_lock); #endif #if 0 @@ -233,7 +268,7 @@ dma_busy |= (1 << chan); - if (isa_dmarangecheck(addr, nbytes, chan)) { + if (dma_range_checked) { if (dma_bouncebuf[chan] == NULL || dma_bouncebufsize[chan] < nbytes) panic("isa_dmastart: bad bounce buffer"); @@ -246,9 +281,6 @@ addr = newaddr; } - /* translate to physical */ - phys = pmap_extract(kernel_pmap, (vm_offset_t)addr); - if (flags & ISADMA_RAW) { dma_auto_mode |= (1 << chan); } else { @@ -323,6 +355,7 @@ /* unmask channel */ outb(DMA2_SMSK, chan & 3); } + mtx_unlock(&isa_dma_lock); } void @@ -336,6 +369,7 @@ printf("isa_dmadone: channel %d not acquired\n", chan); #endif + mtx_lock(&isa_dma_lock); if (((dma_busy & (1 << chan)) == 0) && (dma_auto_mode & (1 << chan)) == 0 ) printf("isa_dmadone: channel %d not busy\n", chan); @@ -351,6 +385,7 @@ dma_bounced &= ~(1 << chan); } dma_busy &= ~(1 << chan); + mtx_unlock(&isa_dma_lock); } /* @@ -367,8 +402,6 @@ vm_offset_t endva; u_int dma_pgmsk = (chan & 4) ? ~(128*1024-1) : ~(64*1024-1); - GIANT_REQUIRED; - endva = (vm_offset_t)round_page((vm_offset_t)va + length); for (; va < (caddr_t) endva ; va += PAGE_SIZE) { phys = trunc_page(pmap_extract(kernel_pmap, (vm_offset_t)va)); @@ -420,13 +453,15 @@ * or -1 if the channel requested is not active. * */ -int -isa_dmastatus(int chan) +static int +isa_dmastatus_locked(int chan) { u_long cnt = 0; int ffport, waport; u_long low1, high1, low2, high2; + mtx_assert(&isa_dma_lock, MA_OWNED); + /* channel active? */ if ((dma_inuse & (1 << chan)) == 0) { printf("isa_dmastatus: channel %d not active\n", chan); @@ -472,6 +507,18 @@ return(cnt); } +int +isa_dmastatus(int chan) +{ + int status; + + mtx_lock(&isa_dma_lock); + status = isa_dmastatus_locked(chan); + mtx_unlock(&isa_dma_lock); + + return (status); +} + /* * Reached terminal count yet ? */ @@ -491,12 +538,16 @@ int isa_dmastop(int chan) { + int status; + + mtx_lock(&isa_dma_lock); if ((dma_inuse & (1 << chan)) == 0) printf("isa_dmastop: channel %d not acquired\n", chan); if (((dma_busy & (1 << chan)) == 0) && ((dma_auto_mode & (1 << chan)) == 0)) { printf("chan %d not busy\n", chan); + mtx_unlock(&isa_dma_lock); return -2 ; } @@ -505,7 +556,12 @@ } else { outb(DMA2_SMSK, (chan & 3) | 4 /* disable mask */); } - return(isa_dmastatus(chan)); + + status = isa_dmastatus_locked(chan); + + mtx_unlock(&isa_dma_lock); + + return (status); } /* ==== //depot/projects/usb/src/sys/arm/arm/db_trace.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.14 2007/12/02 20:40:31 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.16 2009/11/05 06:27:46 marcel Exp $"); #include #include @@ -194,18 +194,18 @@ int db_trace_thread(struct thread *thr, int count) { - uint32_t addr; + struct pcb *ctx; - if (thr == curthread) - addr = (uint32_t)__builtin_frame_address(0); - else - addr = thr->td_pcb->un_32.pcb32_r11; - db_stack_trace_cmd(addr, -1); + ctx = kdb_thr_ctx(thr); + db_stack_trace_cmd(ctx->un_32.pcb32_r11, -1); return (0); } void db_trace_self(void) { - db_trace_thread(curthread, -1); + db_addr_t addr; + + addr = (db_addr_t)__builtin_frame_address(1); + db_stack_trace_cmd(addr, -1); } ==== //depot/projects/usb/src/sys/arm/arm/gdb_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/gdb_machdep.c,v 1.1 2006/07/14 00:50:51 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/gdb_machdep.c,v 1.2 2009/11/05 06:31:50 marcel Exp $"); #include @@ -53,12 +53,15 @@ *regsz = gdb_cpu_regsz(regnum); - if (kdb_thread == curthread) { - if (regnum < 16) - return (&kdb_frame->tf_r0 + 4 * regnum); + if (kdb_thread == curthread) { + if (regnum < 15) + return (&kdb_frame->tf_r0 + regnum); + if (regnum == 15) + return (&kdb_frame->tf_pc); if (regnum == 25) return (&kdb_frame->tf_spsr); } + switch (regnum) { case 8: return (&kdb_thrctx->un_32.pcb32_r8); case 9: return (&kdb_thrctx->un_32.pcb32_r9); @@ -78,6 +81,7 @@ return (&kdb_thrctx->un_32.pcb32_pc); } } + return (NULL); } ==== //depot/projects/usb/src/sys/arm/arm/machdep.c#11 (text+ko) ==== @@ -46,7 +46,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.34 2009/10/27 10:47:58 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.35 2009/11/04 04:41:03 alc Exp $"); #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 12 08:12:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31B321065693; Thu, 12 Nov 2009 08:12: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 DD328106568F for ; Thu, 12 Nov 2009 08:12:13 +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 CAFF28FC15 for ; Thu, 12 Nov 2009 08:12:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAC8CDuZ013221 for ; Thu, 12 Nov 2009 08:12:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAC8CDDa013219 for perforce@freebsd.org; Thu, 12 Nov 2009 08:12:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 12 Nov 2009 08:12:13 GMT Message-Id: <200911120812.nAC8CDDa013219@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 08:12:14 -0000 http://p4web.freebsd.org/chv.cgi?CH=170529 Change 170529 by hselasky@hselasky_laptop001 on 2009/11/12 08:11:42 USB audio: - fix initialization order Affected files ... .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#60 edit Differences ... ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#60 (text+ko) ==== @@ -1318,6 +1318,11 @@ ch->pcm_cap.minspeed = ch->sample_rate; ch->pcm_cap.maxspeed = ch->sample_rate; + /* setup mutex and PCM channel */ + + ch->pcm_ch = c; + ch->pcm_mtx = c->lock; + if (ch->p_asf1d->bNrChannels >= 2) ch->pcm_cap.fmtlist[0] = SND_FORMAT(ch->p_fmt->freebsd_fmt, 2, 0); @@ -1391,8 +1396,6 @@ ch->start = ch->buf; ch->end = ch->buf + buf_size; ch->cur = ch->buf; - ch->pcm_ch = c; - ch->pcm_mtx = c->lock; ch->pcm_buf = b; if (ch->pcm_mtx == NULL) { From owner-p4-projects@FreeBSD.ORG Thu Nov 12 11:18:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D5C31065679; Thu, 12 Nov 2009 11:18: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 31D881065670 for ; Thu, 12 Nov 2009 11:18:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1DC318FC16 for ; Thu, 12 Nov 2009 11:18:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACBIJ4Y040347 for ; Thu, 12 Nov 2009 11:18:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACBIJia040345 for perforce@freebsd.org; Thu, 12 Nov 2009 11:18:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Nov 2009 11:18:19 GMT Message-Id: <200911121118.nACBIJia040345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 11:18:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=170532 Change 170532 by rwatson@rwatson_vimage_client on 2009/11/12 11:17:20 Use preferred format string for amd64. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/fdrpc/fdrpc.c#6 (text+ko) ==== @@ -87,7 +87,7 @@ &fd_recv, &fdcount) < 0) err(-1, "lch_rpc_rights"); if (len != sizeof(ch)) - errx(-1, "lch_rpc_rights: len %d", len); + errx(-1, "lch_rpc_rights: len %zd", len); if (ch != 'X') errx(-1, "lch_rpc_rights: ch %d", ch); if (fdcount == 1) From owner-p4-projects@FreeBSD.ORG Thu Nov 12 11:18:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DECA1065759; Thu, 12 Nov 2009 11:18: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 44EA21065672 for ; Thu, 12 Nov 2009 11:18:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30EAD8FC17 for ; Thu, 12 Nov 2009 11:18:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACBIJ5d040352 for ; Thu, 12 Nov 2009 11:18:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACBIJH4040350 for perforce@freebsd.org; Thu, 12 Nov 2009 11:18:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Nov 2009 11:18:19 GMT Message-Id: <200911121118.nACBIJH4040350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 11:18:21 -0000 http://p4web.freebsd.org/chv.cgi?CH=170533 Change 170533 by rwatson@rwatson_vimage_client on 2009/11/12 11:17:50 Allow stderr to print from sandboxes. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_echo/sandbox_echo.c#10 (text+ko) ==== @@ -60,7 +60,8 @@ if (argc != 1) errx(-1, "usage: sandbox_echo"); - if (lch_start(MYNAME, sandbox_argv, LCH_PERMIT_STDERR, &lcsp) < 0) + if (lch_start(MYNAME, sandbox_argv, + LCH_PERMIT_STDOUT | LCH_PERMIT_STDERR, &lcsp) < 0) err(-1, "lch_start %s", argv[1]); for (i = 0; i < 10; i++) { From owner-p4-projects@FreeBSD.ORG Thu Nov 12 11:54:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A057E1065696; Thu, 12 Nov 2009 11:54: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 64277106568F for ; Thu, 12 Nov 2009 11:54:57 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 36B008FC28 for ; Thu, 12 Nov 2009 11:54:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACBsvPj042975 for ; Thu, 12 Nov 2009 11:54:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACBsvDK042973 for perforce@freebsd.org; Thu, 12 Nov 2009 11:54:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Nov 2009 11:54:57 GMT Message-Id: <200911121154.nACBsvDK042973@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 11:54:58 -0000 http://p4web.freebsd.org/chv.cgi?CH=170537 Change 170537 by rwatson@rwatson_vimage_client on 2009/11/12 11:54:45 Integrate capabilities rtld from 9-current to pick up relocation fixes. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#30 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#30 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.139 2009/07/17 19:45:42 kib Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.140 2009/10/10 15:27:10 kib Exp $ */ /* @@ -556,6 +556,7 @@ /* Initialize a fake symbol for resolving undefined weak references. */ sym_zero.st_info = ELF_ST_INFO(STB_GLOBAL, STT_NOTYPE); sym_zero.st_shndx = SHN_UNDEF; + sym_zero.st_value = -(uintptr_t)obj_main->relocbase; #ifdef IN_RTLD_CAP if (ld_libcache != NULL) @@ -1115,26 +1116,26 @@ obj = obj_new(); for (ph = phdr; ph < phlimit; ph++) { + if (ph->p_type != PT_PHDR) + continue; + + obj->phdr = phdr; + obj->phsize = ph->p_memsz; + obj->relocbase = (caddr_t)phdr - ph->p_vaddr; + break; + } + + for (ph = phdr; ph < phlimit; ph++) { switch (ph->p_type) { - case PT_PHDR: - if ((const Elf_Phdr *)ph->p_vaddr != phdr) { - _rtld_error("%s: invalid PT_PHDR", path); - return NULL; - } - obj->phdr = (const Elf_Phdr *) ph->p_vaddr; - obj->phsize = ph->p_memsz; - break; - case PT_INTERP: - obj->interp = (const char *) ph->p_vaddr; + obj->interp = (const char *)(ph->p_vaddr + obj->relocbase); break; case PT_LOAD: if (nsegs == 0) { /* First load segment */ obj->vaddrbase = trunc_page(ph->p_vaddr); - obj->mapbase = (caddr_t) obj->vaddrbase; - obj->relocbase = obj->mapbase - obj->vaddrbase; + obj->mapbase = obj->vaddrbase + obj->relocbase; obj->textsize = round_page(ph->p_vaddr + ph->p_memsz) - obj->vaddrbase; } else { /* Last load segment */ @@ -1145,7 +1146,7 @@ break; case PT_DYNAMIC: - obj->dynamic = (const Elf_Dyn *) ph->p_vaddr; + obj->dynamic = (const Elf_Dyn *)(ph->p_vaddr + obj->relocbase); break; case PT_TLS: @@ -1153,7 +1154,7 @@ obj->tlssize = ph->p_memsz; obj->tlsalign = ph->p_align; obj->tlsinitsize = ph->p_filesz; - obj->tlsinit = (void*) ph->p_vaddr; + obj->tlsinit = (void*)(ph->p_vaddr + obj->relocbase); break; } } From owner-p4-projects@FreeBSD.ORG Thu Nov 12 12:22:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17C4A1065676; Thu, 12 Nov 2009 12:22:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF3C5106566C for ; Thu, 12 Nov 2009 12:22:24 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA3568FC1C for ; Thu, 12 Nov 2009 12:22:24 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACCMOsO045910 for ; Thu, 12 Nov 2009 12:22:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACCMOKa045908 for perforce@freebsd.org; Thu, 12 Nov 2009 12:22:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Nov 2009 12:22:24 GMT Message-Id: <200911121222.nACCMOKa045908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170538 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 12:22:25 -0000 http://p4web.freebsd.org/chv.cgi?CH=170538 Change 170538 by rwatson@rwatson_vimage_client on 2009/11/12 12:21:51 Integrate ELF-related kernel code from head into capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/elf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/include/elf.h#4 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/elf.h,v 1.21 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/amd64/include/elf.h,v 1.22 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -106,4 +106,10 @@ #define ELF_TARG_MACH EM_X86_64 #define ELF_TARG_VER 1 +#if __ELF_WORD_SIZE == 32 +#define ET_DYN_LOAD_ADDR 0x01001000 +#else +#define ET_DYN_LOAD_ADDR 0x01021000 +#endif + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/arm/include/elf.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/elf.h,v 1.10 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/arm/include/elf.h,v 1.11 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -97,4 +97,7 @@ * value. */ #define MAGIC_TRAMP_NUMBER 0x5c000003 + +#define ET_DYN_LOAD_ADDR 0x12000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/elf.h,v 1.19 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/i386/include/elf.h,v 1.20 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -105,4 +105,6 @@ #define ELF_TARG_MACH EM_386 #define ELF_TARG_VER 1 +#define ET_DYN_LOAD_ADDR 0x01001000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/elf.h,v 1.17 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/ia64/include/elf.h,v 1.18 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -141,4 +141,6 @@ #define DT_IA_64_PLT_RESERVE 0x70000000 +#define ET_DYN_LOAD_ADDR 0x2500000000000000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/imgact_elf.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.200 2009/10/03 10:50:00 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.203 2009/10/18 12:57:48 kib Exp $"); #include "opt_compat.h" @@ -640,7 +640,8 @@ } for (i = 0, numsegs = 0; i < hdr->e_phnum; i++) { - if (phdr[i].p_type == PT_LOAD) { /* Loadable segment */ + if (phdr[i].p_type == PT_LOAD && phdr[i].p_memsz != 0) { + /* Loadable segment */ prot = 0; if (phdr[i].p_flags & PF_X) prot |= VM_PROT_EXECUTE; @@ -692,9 +693,9 @@ u_long text_size = 0, data_size = 0, total_size = 0; u_long text_addr = 0, data_addr = 0; u_long seg_size, seg_addr; - u_long addr, entry = 0, proghdr = 0; + u_long addr, baddr, et_dyn_addr, entry = 0, proghdr = 0; int32_t osrel = 0; - int error = 0, i; + int error = 0, i, n; const char *interp = NULL, *newinterp = NULL; Elf_Brandinfo *brand_info; char *path; @@ -723,14 +724,22 @@ phdr = (const Elf_Phdr *)(imgp->image_header + hdr->e_phoff); if (!aligned(phdr, Elf_Addr)) return (ENOEXEC); + n = 0; + baddr = 0; for (i = 0; i < hdr->e_phnum; i++) { + if (phdr[i].p_type == PT_LOAD) { + if (n == 0) + baddr = phdr[i].p_vaddr; + n++; + continue; + } if (phdr[i].p_type == PT_INTERP) { /* Path to interpreter */ if (phdr[i].p_filesz > MAXPATHLEN || phdr[i].p_offset + phdr[i].p_filesz > PAGE_SIZE) return (ENOEXEC); interp = imgp->image_header + phdr[i].p_offset; - break; + continue; } } @@ -740,9 +749,19 @@ hdr->e_ident[EI_OSABI]); return (ENOEXEC); } - if (hdr->e_type == ET_DYN && - (brand_info->flags & BI_CAN_EXEC_DYN) == 0) - return (ENOEXEC); + if (hdr->e_type == ET_DYN) { + if ((brand_info->flags & BI_CAN_EXEC_DYN) == 0) + return (ENOEXEC); + /* + * Honour the base load address from the dso if it is + * non-zero for some reason. + */ + if (baddr == 0) + et_dyn_addr = ET_DYN_LOAD_ADDR; + else + et_dyn_addr = 0; + } else + et_dyn_addr = 0; sv = brand_info->sysvec; if (interp != NULL && brand_info->interp_newpath != NULL) newinterp = brand_info->interp_newpath; @@ -769,6 +788,8 @@ for (i = 0; i < hdr->e_phnum; i++) { switch (phdr[i].p_type) { case PT_LOAD: /* Loadable segment */ + if (phdr[i].p_memsz == 0) + break; prot = 0; if (phdr[i].p_flags & PF_X) prot |= VM_PROT_EXECUTE; @@ -788,7 +809,7 @@ if ((error = __elfN(load_section)(vmspace, imgp->object, phdr[i].p_offset, - (caddr_t)(uintptr_t)phdr[i].p_vaddr, + (caddr_t)(uintptr_t)phdr[i].p_vaddr + et_dyn_addr, phdr[i].p_memsz, phdr[i].p_filesz, prot, sv->sv_pagesize)) != 0) return (error); @@ -802,11 +823,12 @@ if (phdr[i].p_offset == 0 && hdr->e_phoff + hdr->e_phnum * hdr->e_phentsize <= phdr[i].p_filesz) - proghdr = phdr[i].p_vaddr + hdr->e_phoff; + proghdr = phdr[i].p_vaddr + hdr->e_phoff + + et_dyn_addr; - seg_addr = trunc_page(phdr[i].p_vaddr); + seg_addr = trunc_page(phdr[i].p_vaddr + et_dyn_addr); seg_size = round_page(phdr[i].p_memsz + - phdr[i].p_vaddr - seg_addr); + phdr[i].p_vaddr + et_dyn_addr - seg_addr); /* * Is this .text or .data? We can't use @@ -828,7 +850,7 @@ phdr[i].p_memsz)) { text_size = seg_size; text_addr = seg_addr; - entry = (u_long)hdr->e_entry; + entry = (u_long)hdr->e_entry + et_dyn_addr; } else { data_size = seg_size; data_addr = seg_addr; @@ -836,7 +858,7 @@ total_size += seg_size; break; case PT_PHDR: /* Program header table info */ - proghdr = phdr[i].p_vaddr; + proghdr = phdr[i].p_vaddr + et_dyn_addr; break; default: break; @@ -908,7 +930,7 @@ return (error); } } else - addr = 0; + addr = et_dyn_addr; /* * Construct auxargs table (used by the fixup routine) ==== //depot/projects/trustedbsd/capabilities/src/sys/mips/include/elf.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * JNPR: elf.h,v 1.4 2006/12/02 09:53:40 katta - * $FreeBSD: src/sys/mips/include/elf.h,v 1.4 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/mips/include/elf.h,v 1.5 2009/10/10 15:31:24 kib Exp $ * */ @@ -250,4 +250,6 @@ #define AT_COUNT 16 /* Count of defined aux entry types. */ +#define ET_DYN_LOAD_ADDR 0x0120000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/elf.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.10 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.11 2009/10/10 15:31:24 kib Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -96,4 +96,6 @@ #define ELF_TARG_MACH EM_PPC #define ELF_TARG_VER 1 +#define ET_DYN_LOAD_ADDR 0x01010000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.17 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/sparc64/include/elf.h,v 1.19 2009/10/18 13:08:15 marius Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -97,4 +97,6 @@ #define ELF_TARG_MACH ELF_ARCH #define ELF_TARG_VER 1 +#define ET_DYN_LOAD_ADDR 0x100000 + #endif /* !_MACHINE_ELF_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/sun4v/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sun4v/include/elf.h,v 1.4 2009/03/17 12:50:16 kib Exp $ + * $FreeBSD: src/sys/sun4v/include/elf.h,v 1.6 2009/10/18 13:08:15 marius Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -97,4 +97,6 @@ #define ELF_TARG_MACH ELF_ARCH #define ELF_TARG_VER 1 +#define ET_DYN_LOAD_ADDR 0x100000 + #endif /* !_MACHINE_ELF_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Nov 12 12:47:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F89C1065676; Thu, 12 Nov 2009 12:47: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 C72661065670 for ; Thu, 12 Nov 2009 12:47:51 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B27338FC1D for ; Thu, 12 Nov 2009 12:47:51 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACClp2a057920 for ; Thu, 12 Nov 2009 12:47:51 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACCloFl057918 for perforce@freebsd.org; Thu, 12 Nov 2009 12:47:50 GMT (envelope-from raj@freebsd.org) Date: Thu, 12 Nov 2009 12:47:50 GMT Message-Id: <200911121247.nACCloFl057918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 12:47:52 -0000 http://p4web.freebsd.org/chv.cgi?CH=170540 Change 170540 by raj@raj_fdt on 2009/11/12 12:47:20 IFC @170536 Affected files ... .. //depot/projects/fdt/Makefile.inc1#2 integrate .. //depot/projects/fdt/UPDATING#2 integrate .. //depot/projects/fdt/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/fdt/bin/ps/keyword.c#2 integrate .. //depot/projects/fdt/bin/sh/arith_lex.l#2 integrate .. //depot/projects/fdt/bin/sh/trap.c#2 integrate .. //depot/projects/fdt/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/fdt/contrib/ee/ee.c#2 integrate .. //depot/projects/fdt/contrib/libpcap/inet.c#2 integrate .. //depot/projects/fdt/crypto/openssh/ssh_namespace.h#2 integrate .. //depot/projects/fdt/etc/rc.d/jail#2 integrate .. //depot/projects/fdt/games/fortune/datfiles/fortunes#2 integrate .. //depot/projects/fdt/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/fdt/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawn.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate .. //depot/projects/fdt/lib/libc/gen/posix_spawnattr_init.3#2 integrate .. //depot/projects/fdt/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/fdt/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/fdt/lib/libc/net/ip6opt.c#2 integrate .. //depot/projects/fdt/lib/libc/nls/C.msg#2 integrate .. //depot/projects/fdt/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/fdt/lib/libc/nls/ja_JP.UTF-8.msg#1 branch .. //depot/projects/fdt/lib/libc/nls/ja_JP.eucJP.msg#1 branch .. //depot/projects/fdt/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate .. //depot/projects/fdt/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate .. //depot/projects/fdt/lib/libc/sys/accept.2#2 integrate .. //depot/projects/fdt/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/fdt/lib/libkvm/kvm_i386.c#2 integrate .. //depot/projects/fdt/lib/libpmc/pmc_attach.3#2 integrate .. //depot/projects/fdt/lib/libstand/udp.c#2 integrate .. //depot/projects/fdt/lib/libusb/libusb.h#2 integrate .. //depot/projects/fdt/lib/libusb/libusb10.c#2 integrate .. //depot/projects/fdt/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/fdt/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/fdt/lib/libusb/libusb20.c#2 integrate .. //depot/projects/fdt/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/fdt/lib/libusb/libusb20_ugen20.c#2 integrate .. //depot/projects/fdt/release/picobsd/bridge/PICOBSD#2 integrate .. //depot/projects/fdt/sbin/camcontrol/camcontrol.8#2 integrate .. //depot/projects/fdt/sbin/camcontrol/camcontrol.c#2 integrate .. //depot/projects/fdt/sbin/ddb/ddb_capture.c#2 integrate .. //depot/projects/fdt/sbin/ifconfig/ifconfig.8#2 integrate .. //depot/projects/fdt/sbin/ifconfig/ifconfig.c#2 integrate .. //depot/projects/fdt/sbin/mknod/mknod.8#2 integrate .. //depot/projects/fdt/sbin/mount/mount.8#2 integrate .. //depot/projects/fdt/sbin/reboot/reboot.c#2 integrate .. //depot/projects/fdt/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/fdt/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/fdt/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/chpmon.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/eltsub.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/eltsub.h#1 branch .. //depot/projects/fdt/share/examples/ses/srcs/getencstat.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/getnobj.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/getobjmap.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/getobjstat.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/inienc.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/sesd.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/setencstat.c#2 integrate .. //depot/projects/fdt/share/examples/ses/srcs/setobjstat.c#2 integrate .. //depot/projects/fdt/share/man/man3/tree.3#2 integrate .. //depot/projects/fdt/share/man/man4/ata.4#2 integrate .. //depot/projects/fdt/share/man/man4/atapicam.4#2 integrate .. //depot/projects/fdt/share/man/man4/hptrr.4#2 integrate .. //depot/projects/fdt/share/man/man4/msk.4#2 integrate .. //depot/projects/fdt/share/man/man4/netintro.4#2 integrate .. //depot/projects/fdt/share/man/man4/tty.4#2 integrate .. //depot/projects/fdt/share/man/man4/umass.4#2 integrate .. //depot/projects/fdt/share/man/man5/ar.5#2 integrate .. //depot/projects/fdt/share/man/man5/make.conf.5#2 integrate .. //depot/projects/fdt/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/fdt/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/fdt/share/man/man7/adding_user.7#2 integrate .. //depot/projects/fdt/share/misc/iso3166#2 integrate .. //depot/projects/fdt/share/misc/organization.dot#2 integrate .. //depot/projects/fdt/share/timedef/ja_JP.SJIS.src#2 integrate .. //depot/projects/fdt/share/timedef/ja_JP.UTF-8.src#2 integrate .. //depot/projects/fdt/share/timedef/ja_JP.eucJP.src#2 integrate .. //depot/projects/fdt/share/zoneinfo/antarctica#2 integrate .. //depot/projects/fdt/share/zoneinfo/asia#2 integrate .. //depot/projects/fdt/share/zoneinfo/europe#2 integrate .. //depot/projects/fdt/share/zoneinfo/zone.tab#2 integrate .. //depot/projects/fdt/sys/amd64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/initcpu.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/fdt/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/fdt/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/fdt/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/fdt/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/fdt/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/fdt/sys/arm/arm/trap.c#2 integrate .. //depot/projects/fdt/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/fdt/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/fdt/sys/arm/mv/mv_machdep.c#2 integrate .. //depot/projects/fdt/sys/arm/mv/mv_sata.c#2 integrate .. //depot/projects/fdt/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/fdt/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/fdt/sys/boot/common/boot.c#2 integrate .. //depot/projects/fdt/sys/boot/uboot/lib/glue.c#2 integrate .. //depot/projects/fdt/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/fdt/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/fdt/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/fdt/sys/cam/ata/ata_pmp.c#2 integrate .. //depot/projects/fdt/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/fdt/sys/cam/cam.c#2 integrate .. //depot/projects/fdt/sys/cam/cam.h#2 integrate .. //depot/projects/fdt/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/fdt/sys/cam/cam_periph.c#2 integrate .. //depot/projects/fdt/sys/cam/cam_periph.h#2 integrate .. //depot/projects/fdt/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/fdt/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/fdt/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/fdt/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/fdt/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/fdt/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/fdt/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/fdt/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/fdt/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/fdt/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/fdt/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/fdt/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/fdt/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/fdt/sys/conf/NOTES#2 integrate .. //depot/projects/fdt/sys/conf/files#2 integrate .. //depot/projects/fdt/sys/conf/files.ia64#2 integrate .. //depot/projects/fdt/sys/conf/options#2 integrate .. //depot/projects/fdt/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/fdt/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/fdt/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/fdt/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/fdt/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/fdt/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/an/if_an.c#2 integrate .. //depot/projects/fdt/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/fdt/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/fdt/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/fdt/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/fdt/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-adaptec.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/fdt/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/fdt/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/fdt/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/fdt/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/fdt/sys/dev/bwi/if_bwi.c#2 integrate .. //depot/projects/fdt/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/fdt/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/fdt/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/fdt/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/fdt/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/fdt/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/fdt/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/fdt/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/fdt/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/fdt/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/fdt/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/fdt/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/fdt/sys/dev/ichwd/ichwd.c#2 integrate .. //depot/projects/fdt/sys/dev/ieee488/ibfoo.c#2 integrate .. //depot/projects/fdt/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/fdt/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/fdt/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/fdt/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/fdt/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/fdt/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/fdt/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/fdt/sys/dev/mii/miidevs#2 integrate .. //depot/projects/fdt/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/fdt/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/fdt/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/fdt/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/fdt/sys/dev/pci/vga_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/re/if_re.c#2 integrate .. //depot/projects/fdt/sys/dev/siis/siis.c#2 integrate .. //depot/projects/fdt/sys/dev/siis/siis.h#2 integrate .. //depot/projects/fdt/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/fdt/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/fdt/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/fdt/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/fdt/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/fdt/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/fdt/sys/dev/syscons/syscons.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/ehci_mbus.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/input/atp.c#1 branch .. //depot/projects/fdt/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/fdt/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/fdt/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/fdt/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/fdt/sys/dev/vge/if_vgevar.h#2 integrate .. //depot/projects/fdt/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/fdt/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/fdt/sys/fs/nfsclient/nfs_clvnops.c#2 integrate .. //depot/projects/fdt/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate .. //depot/projects/fdt/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/fdt/sys/i386/bios/apm.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/trap.c#2 integrate .. //depot/projects/fdt/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/fdt/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/fdt/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/highfp.c#1 branch .. //depot/projects/fdt/sys/ia64/ia64/interrupt.c#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/fdt/sys/ia64/ia64/vm_machdep.c#2 integrate .. //depot/projects/fdt/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/fdt/sys/ia64/include/proc.h#2 integrate .. //depot/projects/fdt/sys/isa/vga_isa.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_idle.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_intr.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_jail.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_lock.c#2 integrate .. //depot/projects/fdt/sys/kern/kern_sig.c#2 integrate .. //depot/projects/fdt/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/fdt/sys/kern/sched_ule.c#2 integrate .. //depot/projects/fdt/sys/kern/subr_bus.c#2 integrate .. //depot/projects/fdt/sys/kern/subr_log.c#2 integrate .. //depot/projects/fdt/sys/kern/subr_prf.c#2 integrate .. //depot/projects/fdt/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/fdt/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/fdt/sys/kern/vfs_default.c#2 integrate .. //depot/projects/fdt/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/fdt/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/fdt/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/fdt/sys/libkern/inet_aton.c#1 branch .. //depot/projects/fdt/sys/mips/include/pcb.h#2 integrate .. //depot/projects/fdt/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/trap.c#2 integrate .. //depot/projects/fdt/sys/mips/mips/vm_machdep.c#2 integrate .. //depot/projects/fdt/sys/modules/ichwd/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/usb/Makefile#2 integrate .. //depot/projects/fdt/sys/modules/usb/atp/Makefile#1 branch .. //depot/projects/fdt/sys/net/if.c#2 integrate .. //depot/projects/fdt/sys/net/if.h#2 integrate .. //depot/projects/fdt/sys/net/if_ef.c#2 integrate .. //depot/projects/fdt/sys/net/if_var.h#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/fdt/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_iface.c#2 integrate .. //depot/projects/fdt/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/fdt/sys/netinet/in.h#2 integrate .. //depot/projects/fdt/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/fdt/sys/netinet/ip_ipsec.h#2 integrate .. //depot/projects/fdt/sys/netinet/ip_output.c#2 integrate .. //depot/projects/fdt/sys/netinet/ipfw/ip_dummynet.c#2 integrate .. //depot/projects/fdt/sys/netinet/libalias/alias_proxy.c#2 integrate .. //depot/projects/fdt/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/fdt/sys/netinet/tcp_output.c#2 integrate .. //depot/projects/fdt/sys/netinet6/nd6.c#2 integrate .. //depot/projects/fdt/sys/pc98/cbus/cbus_dma.c#2 integrate .. //depot/projects/fdt/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/copyinout.c#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/mmu_oea64.c#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/swtch.S#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/fdt/sys/powerpc/aim/vm_machdep.c#2 integrate .. //depot/projects/fdt/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/fdt/sys/powerpc/booke/vm_machdep.c#2 integrate .. //depot/projects/fdt/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/fdt/sys/powerpc/powerpc/stack_machdep.c#2 integrate .. //depot/projects/fdt/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/fdt/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/fdt/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/fdt/sys/sun4v/sun4v/trap.c#2 integrate .. //depot/projects/fdt/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/fdt/sys/sys/aac_ioctl.h#2 integrate .. //depot/projects/fdt/sys/sys/ata.h#2 integrate .. //depot/projects/fdt/sys/sys/conf.h#2 integrate .. //depot/projects/fdt/sys/sys/fbio.h#2 integrate .. //depot/projects/fdt/sys/sys/mman.h#2 integrate .. //depot/projects/fdt/sys/sys/msgbuf.h#2 integrate .. //depot/projects/fdt/sys/sys/param.h#2 integrate .. //depot/projects/fdt/sys/sys/priv.h#2 integrate .. //depot/projects/fdt/sys/sys/proc.h#2 integrate .. //depot/projects/fdt/sys/sys/signalvar.h#2 integrate .. //depot/projects/fdt/sys/sys/sockio.h#2 integrate .. //depot/projects/fdt/sys/teken/teken.c#2 integrate .. //depot/projects/fdt/sys/teken/teken.h#2 integrate .. //depot/projects/fdt/sys/teken/teken_subr.h#2 integrate .. //depot/projects/fdt/sys/vm/swap_pager.c#2 integrate .. //depot/projects/fdt/sys/vm/vm_fault.c#2 integrate .. //depot/projects/fdt/sys/vm/vm_map.c#2 integrate .. //depot/projects/fdt/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/fdt/tools/regression/lib/libutil/Makefile#2 integrate .. //depot/projects/fdt/tools/regression/lib/libutil/test-flopen.c#2 integrate .. //depot/projects/fdt/tools/regression/lib/libutil/test-grp.c#2 integrate .. //depot/projects/fdt/tools/regression/lib/libutil/test-pidfile.c#1 branch .. //depot/projects/fdt/tools/regression/lib/libutil/test-trimdomain-nodomain.c#2 integrate .. //depot/projects/fdt/tools/regression/lib/libutil/test-trimdomain.c#2 integrate .. //depot/projects/fdt/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate .. //depot/projects/fdt/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate .. //depot/projects/fdt/usr.bin/gzip/unbzip2.c#2 integrate .. //depot/projects/fdt/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/fdt/usr.bin/leave/leave.c#2 integrate .. //depot/projects/fdt/usr.bin/logger/logger.c#2 integrate .. //depot/projects/fdt/usr.bin/tail/tail.1#2 integrate .. //depot/projects/fdt/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/fdt/usr.sbin/crashinfo/crashinfo.sh#2 integrate .. //depot/projects/fdt/usr.sbin/i2c/i2c.8#2 integrate .. //depot/projects/fdt/usr.sbin/nfsd/stablerestart.5#2 integrate .. //depot/projects/fdt/usr.sbin/sysinstall/Makefile#2 integrate .. //depot/projects/fdt/usr.sbin/sysinstall/acpi.c#2 delete .. //depot/projects/fdt/usr.sbin/sysinstall/acpidump.h#2 delete .. //depot/projects/fdt/usr.sbin/sysinstall/biosmptable.c#2 delete .. //depot/projects/fdt/usr.sbin/sysinstall/dist.c#2 integrate .. //depot/projects/fdt/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/fdt/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/fdt/usr.sbin/sysinstall/sysinstall.8#2 integrate .. //depot/projects/fdt/usr.sbin/usbconfig/dump.c#2 integrate .. //depot/projects/fdt/usr.sbin/usbconfig/usbconfig.8#2 integrate .. //depot/projects/fdt/usr.sbin/vidcontrol/vidcontrol.1#2 integrate .. //depot/projects/fdt/usr.sbin/vidcontrol/vidcontrol.c#2 integrate .. //depot/projects/fdt/usr.sbin/wake/wake.8#2 integrate .. //depot/projects/fdt/usr.sbin/zic/zdump.c#2 integrate .. //depot/projects/fdt/usr.sbin/zic/zic.8#2 integrate Differences ... ==== //depot/projects/fdt/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.632 2009/10/28 07:05:32 edwin Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.633 2009/11/01 08:20:30 rdivacky Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -272,7 +272,7 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \ - -iprefix ${LIB32TMP}/usr/ \ + -isystem ${LIB32TMP}/usr/include/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 ==== //depot/projects/fdt/UPDATING#2 (text+ko) ==== @@ -22,6 +22,11 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091109: + The layout of the structure ieee80211req_scan_result has changed. + Applications that require wireless scan results (e.g. ifconfig(8)) + from net80211 need to be recompiled. + 20091025: The iwn(4) driver has been updated to support the 5000 and 5150 series. There's one kernel module for each firmware. Adding "device iwnfw" @@ -537,6 +542,11 @@ # Map old usb library to new one for usb2 stack libusb-0.1.so.8 libusb20.so.1 +20090209: + All USB ethernet devices now attach as interfaces under the name ueN + (eg. ue0). This is to provide a predictable name as vendors often + change usb chipsets in a product without notice. + 20090203: The ichsmb(4) driver has been changed to require SMBus slave addresses be left-justified (xxxxxxx0b) rather than right-justified. @@ -1047,4 +1057,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.643 2009/10/26 09:16:08 mav Exp $ +$FreeBSD: src/UPDATING,v 1.645 2009/11/09 16:05:32 rpaulo Exp $ ==== //depot/projects/fdt/bin/getfacl/getfacl.1#2 (text+ko) ==== @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.12 2009/09/04 10:22:29 trasz Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.13 2009/11/02 12:35:38 brueffer Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. .\" -.Dd September 04, 2009 +.Dd September 4, 2009 .Dt GETFACL 1 .Os .Sh NAME ==== //depot/projects/fdt/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.79 2009/02/26 18:01:07 attilio Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $"); #include #include @@ -70,7 +70,7 @@ /* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */ static VAR var[] = { - {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0}, + {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 5, 0, CHAR, NULL, 0}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0}, {"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT, "x", 0}, @@ -159,7 +159,7 @@ UINT, UIDFMT, 0}, {"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname, USERLEN, 0, CHAR, NULL, 0}, - {"rss", "RSS", NULL, 0, kvar, NULL, 5, KOFF(ki_rssize), PGTOK, "ld", 0}, + {"rss", "RSS", NULL, 0, kvar, NULL, 6, KOFF(ki_rssize), PGTOK, "ld", 0}, {"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR, NULL, 0}, {"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid), @@ -207,7 +207,7 @@ NULL, 0}, {"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"vsz", "VSZ", NULL, 0, vsize, NULL, 5, 0, CHAR, NULL, 0}, + {"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, CHAR, NULL, 0}, {"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0}, {"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT, "x", 0}, ==== //depot/projects/fdt/bin/sh/arith_lex.l#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.24 2005/08/13 07:59:46 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.25 2009/11/05 20:44:39 jilles Exp $"); #include @@ -51,6 +51,13 @@ int yylex(void); +struct varname +{ + struct varname *next; + char name[1]; +}; +static struct varname *varnames; + #undef YY_INPUT #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; @@ -80,11 +87,14 @@ * If variable doesn't exist, we should initialize * it to zero. */ - char *temp; + struct varname *temp; if (lookupvar(yytext) == NULL) setvarsafe(yytext, "0", 0); - temp = (char *)ckmalloc(strlen(yytext) + 1); - yylval.s_value = strcpy(temp, yytext); + temp = ckmalloc(sizeof(struct varname) + + strlen(yytext)); + temp->next = varnames; + varnames = temp; + yylval.s_value = strcpy(temp->name, yytext); return ARITH_VAR; } @@ -130,5 +140,15 @@ void arith_lex_reset(void) { + struct varname *name, *next; + YY_NEW_FILE; + + name = varnames; + while (name != NULL) { + next = name->next; + ckfree(name); + name = next; + } + varnames = NULL; } ==== //depot/projects/fdt/bin/sh/trap.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.34 2009/06/13 21:10:41 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.35 2009/11/11 23:13:24 jilles Exp $"); #include #include @@ -244,7 +244,8 @@ setsignal(int signo) { int action; - sig_t sig, sigact = SIG_DFL; + sig_t sigact = SIG_DFL; + struct sigaction sa; char *t; if ((t = trap[signo]) == NULL) @@ -320,9 +321,10 @@ case S_IGN: sigact = SIG_IGN; break; } *t = action; - sig = signal(signo, sigact); - if (sig != SIG_ERR && action == S_CATCH) - siginterrupt(signo, 1); + sa.sa_handler = sigact; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + sigaction(signo, &sa, NULL); } ==== //depot/projects/fdt/contrib/bind9/bin/dig/dighost.c#2 (text+ko) ==== @@ -2604,10 +2604,12 @@ if (sevent->result == ISC_R_CANCELED) { debug("in cancel handler"); - isc_socket_detach(&query->sock); - sockcount--; - INSIST(sockcount >= 0); - debug("sockcount=%d", sockcount); + if (query->sock != NULL) { + isc_socket_detach(&query->sock); + sockcount--; + INSIST(sockcount >= 0); + debug("sockcount=%d", sockcount); + } query->waiting_connect = ISC_FALSE; isc_event_free(&event); l = query->lookup; ==== //depot/projects/fdt/contrib/ee/ee.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.7 2009/09/04 07:42:13 ache Exp $"); +__FBSDID("$FreeBSD: src/contrib/ee/ee.c,v 1.8 2009/11/10 00:48:24 delphij Exp $"); char *ee_copyright_message = "Copyright (c) 1986, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2009 Hugh Mahon "; @@ -1989,7 +1989,7 @@ int number; int i; char *ptr; - char *direction = NULL; + char *direction = "d"; struct text *t_line; ptr = cmd_str; ==== //depot/projects/fdt/contrib/libpcap/inet.c#2 (text+ko) ==== @@ -403,22 +403,30 @@ pcap_addr_t *curaddr, *prevaddr, *nextaddr; #ifdef SIOCGIFDESCR struct ifreq ifrdesc; +#ifdef __FreeBSD__ +#define _IFDESCRSIZE 64 + char ifdescr[_IFDESCRSIZE]; +#else char ifdescr[IFDESCRSIZE]; +#endif int s; -#endif -#ifdef SIOCGIFDESCR /* * Get the description for the interface. */ memset(&ifrdesc, 0, sizeof ifrdesc); strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name); +#ifdef __FreeBSD__ + ifrdesc.ifr_buffer.buffer = ifdescr; + ifrdesc.ifr_buffer.length = _IFDESCRSIZE; +#else ifrdesc.ifr_data = (caddr_t)&ifdescr; +#endif s = socket(AF_INET, SOCK_DGRAM, 0); if (s >= 0) { if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0 && - strlen(ifrdesc.ifr_data) != 0) - description = ifrdesc.ifr_data; + strlen(ifdescr) != 0) + description = ifdescr; close(s); } #endif ==== //depot/projects/fdt/crypto/openssh/ssh_namespace.h#2 (text) ==== @@ -9,7 +9,7 @@ * * nm libssh.a | awk '/[0-9a-z] [A-Z] / && $3 !~ /^ssh_/ { print "#define", $3, "ssh_" $3 }' * - * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.8 2009/10/05 18:55:13 des Exp $ + * $FreeBSD: src/crypto/openssh/ssh_namespace.h,v 1.9 2009/11/10 09:45:43 des Exp $ */ #define a2port ssh_a2port @@ -223,6 +223,8 @@ #define get_u32 ssh_get_u32 #define get_u64 ssh_get_u64 #define getrrsetbyname ssh_getrrsetbyname +#define glob ssh_glob +#define globfree ssh_globfree #define host_hash ssh_host_hash #define hostfile_read_key ssh_hostfile_read_key #define hpdelim ssh_hpdelim ==== //depot/projects/fdt/etc/rc.d/jail#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.43 2009/06/10 18:18:14 ed Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.44 2009/11/02 09:56:46 remko Exp $ # # PROVIDE: jail @@ -728,4 +728,4 @@ if [ -n "$*" ]; then jail_list="$*" fi -run_rc_command "${cmd}" +run_rc_command "${cmd}" & ==== //depot/projects/fdt/games/fortune/datfiles/fortunes#2 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.277 2009/10/06 02:13:32 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.280 2009/11/07 22:13:29 dougb Exp $ % ======================================================================= || || @@ -69,6 +69,17 @@ -- CommUNIXque 1:1, ASCAR Business Systems % + 1/2 + 12 + 144 + 20 + 3*4 2 + ---------------------- + 5 * 11 = 9 + 0 + 7 + +A dozen, a gross and a score, +Plus three times the square root of four, + Divided by seven, + Plus five times eleven, +Equals nine squared plus zero, no more! +% -- Gifts for Children -- This is easy. You never have to figure out what to get for children, @@ -674,17 +685,6 @@ % ... with liberty and justice for all who can afford it. % - 1/2 - 12 + 144 + 20 + 3*4 2 - ---------------------- + 5 * 11 = 9 + 0 - 7 - -A dozen, a gross and a score, -Plus three times the square root of four, - Divided by seven, - Plus five times eleven, -Equals nine squared plus zero, no more! -% 7,140 pounds on the Sun 97 pounds on Mercury or Mars 255 pounds on Earth @@ -2516,12 +2516,6 @@ yourself for far less money. This article can help you. -- Dave Barry, "The Taming of the Screw" % - I'd say that VCS is more like the anal sex of the software -world: Everybody talks about it, some people do it, some people enjoy -it, but typically only vague implications about the best techniques -are ever voiced in public. - -- Warner Losh, on Version Control Systems -% "I'll tell you what I know, then," he decided. "The pin I'm wearing means I'm a member of the IA. That's Inamorati Anonymous. An inamorato is somebody in love. That's the worst addiction of all." @@ -25228,7 +25222,8 @@ -- Sylvestre Matuschka, "the Hungarian Train Wreck Freak", escaped prison 1937, not heard from since % -Iam +I +am not very happy @@ -33070,6 +33065,10 @@ % May a Misguided Platypus lay its Eggs in your Jockey Shorts % +May all your Emus lay soft boiled eggs, and may all your +Kangaroos be born with iPods already fitted. + -- Aussie New Years wish, found on hasselbladinfo.com +% May all your PUSHes be POPped. % May Euell Gibbons eat your only copy of the manual! @@ -59769,6 +59768,17 @@ and now you're telling me just to be myself? -- The Return of the Secaucus Seven % +You've decked the halls with a dozen miles' length of electric lights. +Your front lawn is a gleaming testament of incandescent wonder. The neighbors +wear sunglasses 24/7, and orbiting satellites have officially picked up +and pinpointed your house as the brightest spot on earth. + +You've finally put together the Christmas wonderland of your dreams... now +if only you could get a good picture of it. + +Photographing holiday lights is no easy task. + -- from an email sent by photojojo.com +% You've got to have a gimmick if your band sucks. -- Gary Giddens % @@ -59809,18 +59819,3 @@ Zymurgy's Law of Volunteer Labor: People are always available for work in the past tense. % -You've decked the halls with a dozen miles' length of electric lights. -Your front lawn is a gleaming testament of incandescent wonder. The neighbors -wear sunglasses 24/7, and orbiting satellites have officially picked up -and pinpointed your house as the brightest spot on earth. - -You've finally put together the Christmas wonderland of your dreams... now -if only you could get a good picture of it. - -Photographing holiday lights is no easy task. - -- from an email sent by photojojo.com -% -May all your Emus lay soft boiled eggs, and may all your -Kangaroos be born with iPods already fitted. - -- Aussie New Years wish, found on hasselbladinfo.com -% ==== //depot/projects/fdt/games/fortune/datfiles/fortunes-o.real#2 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.32 2009/07/16 20:29:36 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.33 2009/11/07 21:28:21 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -1153,6 +1153,12 @@ "Gabriel's trumpet will produce you from the ass of a pig." -- Al Swearingen, E. B. Farnum, _Deadwood_ % + I'd say that VCS is more like the anal sex of the software +world: Everybody talks about it, some people do it, some people enjoy +it, but typically only vague implications about the best techniques +are ever voiced in public. + -- Warner Losh, on Version Control Systems +% "I'll tell ya, Jeb," Wilbur said to his friend, "the tractor business ain't doin' too well. I ain't sold one all month. "You think you've got problems?" Jeb replied. "The other day, I went ==== //depot/projects/fdt/lib/libc/gen/fmtmsg.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.5 2003/05/01 19:03:13 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.6 2009/11/08 14:02:54 brueffer Exp $"); #include #include @@ -128,7 +128,7 @@ size += strlen(sevname); if (text != MM_NULLTXT) size += strlen(text); - if (text != MM_NULLACT) + if (act != MM_NULLACT) size += strlen(act); if (tag != MM_NULLTAG) size += strlen(tag); ==== //depot/projects/fdt/lib/libc/gen/posix_spawn.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.2 2008/07/28 09:36:56 ed Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWN 3 .Os .Sh NAME ==== //depot/projects/fdt/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.2 2008/07/28 09:36:56 ed Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 3 .Os .Sh NAME ==== //depot/projects/fdt/lib/libc/gen/posix_spawn_file_actions_init.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWN_FILE_ACTIONS_INIT 3 .Os .Sh NAME ==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getflags.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETFLAGS 3 .Os .Sh NAME ==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getpgroup.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETPGROUP 3 .Os .Sh NAME ==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getschedparam.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSCHEDPARAM 3 .Os .Sh NAME ==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSCHEDPOLICY 3 .Os .Sh NAME ==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSIGDEFAULT 3 .Os .Sh NAME ==== //depot/projects/fdt/lib/libc/gen/posix_spawnattr_getsigmask.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSIGMASK 3 .Os .Sh NAME >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 12 13:08:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76D131065694; Thu, 12 Nov 2009 13:08: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 3B18E106568B for ; Thu, 12 Nov 2009 13:08:12 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 26B648FC18 for ; Thu, 12 Nov 2009 13:08:12 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACD8Bmd060278 for ; Thu, 12 Nov 2009 13:08:11 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACD8B3x060276 for perforce@freebsd.org; Thu, 12 Nov 2009 13:08:11 GMT (envelope-from raj@freebsd.org) Date: Thu, 12 Nov 2009 13:08:11 GMT Message-Id: <200911121308.nACD8B3x060276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170541 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 13:08:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=170541 Change 170541 by raj@raj_fdt on 2009/11/12 13:07:24 Vendor import of the DTC/libfdt package. Obtained from: git://git.jdl.com/software/dtc.git Affected files ... .. //depot/projects/fdt/sys/contrib/dtc/Documentation/dtc-paper.bib#1 add .. //depot/projects/fdt/sys/contrib/dtc/Documentation/dtc-paper.tex#1 add .. //depot/projects/fdt/sys/contrib/dtc/Documentation/dts-format.txt#1 add .. //depot/projects/fdt/sys/contrib/dtc/Documentation/manual.txt#1 add .. //depot/projects/fdt/sys/contrib/dtc/GPL#1 add .. //depot/projects/fdt/sys/contrib/dtc/Makefile#1 add .. //depot/projects/fdt/sys/contrib/dtc/Makefile.convert-dtsv0#1 add .. //depot/projects/fdt/sys/contrib/dtc/Makefile.dtc#1 add .. //depot/projects/fdt/sys/contrib/dtc/Makefile.ftdump#1 add .. //depot/projects/fdt/sys/contrib/dtc/README.license#1 add .. //depot/projects/fdt/sys/contrib/dtc/TODO#1 add .. //depot/projects/fdt/sys/contrib/dtc/checks.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/convert-dtsv0-lexer.l#1 add .. //depot/projects/fdt/sys/contrib/dtc/data.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/dtc-lexer.l#1 add .. //depot/projects/fdt/sys/contrib/dtc/dtc-parser.y#1 add .. //depot/projects/fdt/sys/contrib/dtc/dtc.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/dtc.h#1 add .. //depot/projects/fdt/sys/contrib/dtc/flattree.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/fstree.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/ftdump.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/Makefile.libfdt#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/TODO#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt.h#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_ro.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_rw.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_strerror.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_sw.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_wip.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt.h#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_env.h#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_internal.h#1 add .. //depot/projects/fdt/sys/contrib/dtc/libfdt/version.lds#1 add .. //depot/projects/fdt/sys/contrib/dtc/livetree.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/scripts/setlocalversion#1 add .. //depot/projects/fdt/sys/contrib/dtc/srcpos.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/srcpos.h#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/Makefile.tests#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/add_subnode_with_nops.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/aliases.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/asm_tree_dump.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-empty-ranges.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-name-property.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-ncells.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-reg-ranges.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-string-props.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/base01.asm#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/base01.cmd#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/base01.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/base01.stderr#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/boot-cpuid.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/comments-cmp.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/comments.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/data.S#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/default-addr-size.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/del_node.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/del_property.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/dtbs_equal_ordered.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/dtc-checkfails.sh#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/dtc-fatal.sh#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/dumptrees.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/dup-nodename.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/dup-phandle.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/dup-propname.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/empty.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/escapes.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/extra-terminating-null.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/extra-terminating-null.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/find_property.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/get_alias.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/get_mem_rsv.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/get_name.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/get_path.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/get_phandle.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/getprop.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/incbin.bin#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/incbin.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/incbin.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/include0.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/include1.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/include2.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/include3.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/include4.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/include5.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/include6.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/include7.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/include8.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/label01.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/mangle-layout.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/mangle-layout.supp#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/minusone-phandle.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/move_and_save.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/node_check_compatible.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/node_offset_by_compatible.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/node_offset_by_phandle.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/node_offset_by_prop_value.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/nonexist-label-ref.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/nonexist-node-ref.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/nop_node.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/nop_property.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/nopulate.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/notfound.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/obsolete-chosen-interrupt-controller.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/open_pack.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/open_pack.supp#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/parent_offset.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/path-references.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/path-references.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/path_offset.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/path_offset_aliases.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/prop-after-subnode.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/references.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/references.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/references_dts0.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/reg-ranges-root.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/root_node.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/run_tests.sh#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/rw_tree1.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/set_name.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/setprop.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/setprop_inplace.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/string_escapes.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/subnode_offset.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/supernode_atdepth_offset.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/sw_tree1.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/test01.asm#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/test01.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/test01.stderr#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/test_kernel_dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/test_tree1.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/test_tree1_dts0.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/testdata.h#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/tests.h#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/tests.sh#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/testutils.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/trees.S#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/truncated_property.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/value-labels.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/value-labels.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/tests/zero-phandle.dts#1 add .. //depot/projects/fdt/sys/contrib/dtc/treesource.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/util.c#1 add .. //depot/projects/fdt/sys/contrib/dtc/util.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Nov 12 13:37:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33EC2106568F; Thu, 12 Nov 2009 13:37: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 D39671065694 for ; Thu, 12 Nov 2009 13:37:41 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B91CC8FC28 for ; Thu, 12 Nov 2009 13:37:41 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACDbfke062406 for ; Thu, 12 Nov 2009 13:37:41 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACDbfSa062404 for perforce@freebsd.org; Thu, 12 Nov 2009 13:37:41 GMT (envelope-from mav@freebsd.org) Date: Thu, 12 Nov 2009 13:37:41 GMT Message-Id: <200911121337.nACDbfSa062404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 13:37:42 -0000 http://p4web.freebsd.org/chv.cgi?CH=170543 Change 170543 by mav@mav_mavbook on 2009/11/12 13:37:13 Remove code that 10 years ago was closing race between sim_action() and device/SIM freeze. It just impossible with present CAM locking, but caused some unexpected side effects. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#6 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#5 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#127 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#6 (text+ko) ==== @@ -334,7 +334,6 @@ } ccbq->devq_openings = openings; ccbq->dev_openings = openings; - TAILQ_INIT(&ccbq->active_ccbs); return (0); } ==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#5 (text+ko) ==== @@ -60,7 +60,6 @@ int dev_openings; int dev_active; int held; - struct ccb_hdr_tailq active_ccbs; }; struct cam_ed; @@ -209,9 +208,6 @@ cam_ccbq_send_ccb(struct cam_ccbq *ccbq, union ccb *send_ccb) { - TAILQ_INSERT_TAIL(&ccbq->active_ccbs, - &(send_ccb->ccb_h), - xpt_links.tqe); send_ccb->ccb_h.pinfo.index = CAM_ACTIVE_INDEX; ccbq->dev_active++; ccbq->dev_openings--; @@ -220,8 +216,7 @@ static __inline void cam_ccbq_ccb_done(struct cam_ccbq *ccbq, union ccb *done_ccb) { - TAILQ_REMOVE(&ccbq->active_ccbs, &done_ccb->ccb_h, - xpt_links.tqe); + ccbq->dev_active--; ccbq->dev_openings++; ccbq->held++; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#127 (text+ko) ==== @@ -3327,9 +3327,7 @@ } mtx_unlock(&xsoftc.xpt_lock); } - devq->active_dev = device; cam_ccbq_remove_ccb(&device->ccbq, work_ccb); - cam_ccbq_send_ccb(&device->ccbq, work_ccb); devq->send_openings--; @@ -3367,8 +3365,6 @@ */ sim = work_ccb->ccb_h.path->bus->sim; (*(sim->sim_action))(sim, work_ccb); - - devq->active_dev = NULL; } devq->send_queue.qfrozen_cnt--; } @@ -4099,45 +4095,18 @@ u_int32_t xpt_freeze_devq(struct cam_path *path, u_int count) { - struct ccb_hdr *ccbh; mtx_assert(path->bus->sim->mtx, MA_OWNED); - path->device->ccbq.queue.qfrozen_cnt += count; - - /* - * Mark the last CCB in the queue as needing - * to be requeued if the driver hasn't - * changed it's state yet. This fixes a race - * where a ccb is just about to be queued to - * a controller driver when it's interrupt routine - * freezes the queue. To completly close the - * hole, controller drives must check to see - * if a ccb's status is still CAM_REQ_INPROG - * just before they queue - * the CCB. See ahc_action/ahc_freeze_devq for - * an example. - */ - ccbh = TAILQ_LAST(&path->device->ccbq.active_ccbs, ccb_hdr_tailq); - if (ccbh && ccbh->status == CAM_REQ_INPROG) - ccbh->status = CAM_REQUEUE_REQ; return (path->device->ccbq.queue.qfrozen_cnt); } u_int32_t xpt_freeze_simq(struct cam_sim *sim, u_int count) { + mtx_assert(sim->mtx, MA_OWNED); - sim->devq->send_queue.qfrozen_cnt += count; - if (sim->devq->active_dev != NULL) { - struct ccb_hdr *ccbh; - - ccbh = TAILQ_LAST(&sim->devq->active_dev->ccbq.active_ccbs, - ccb_hdr_tailq); - if (ccbh && ccbh->status == CAM_REQ_INPROG) - ccbh->status = CAM_REQUEUE_REQ; - } return (sim->devq->send_queue.qfrozen_cnt); } From owner-p4-projects@FreeBSD.ORG Thu Nov 12 14:24:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 696501065679; Thu, 12 Nov 2009 14:24:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C629106566B for ; Thu, 12 Nov 2009 14:24:29 +0000 (UTC) (envelope-from jona@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19C508FC1B for ; Thu, 12 Nov 2009 14:24:29 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACEOS5Y066734 for ; Thu, 12 Nov 2009 14:24:28 GMT (envelope-from jona@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACEOSZM066732 for perforce@freebsd.org; Thu, 12 Nov 2009 14:24:28 GMT (envelope-from jona@FreeBSD.org) Date: Thu, 12 Nov 2009 14:24:28 GMT Message-Id: <200911121424.nACEOSZM066732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jona@FreeBSD.org using -f From: Jonathan Anderson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 14:24:29 -0000 http://p4web.freebsd.org/chv.cgi?CH=170545 Change 170545 by jona@jona-capsicum-belle64 on 2009/11/12 14:23:34 Some CSU cleanup Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#6 edit .. //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#5 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/amd64/crt1.c#5 (text+ko) ==== @@ -44,7 +44,6 @@ extern void _fini(void); extern void _init(void); extern int main(int, char **, char **); -extern int cap_main(int, char **, char **) __attribute__((weak)); extern void _start(char **, void (*)(void)); extern void _capstart(char **, void (*)(void)); ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/common/crtbrand.c#6 (text+ko) ==== @@ -54,11 +54,14 @@ -int cap_main(int argc, char **argv, char **env) +extern int cap_main(int, char **, char **) __attribute__((weak)); +int cap_main(__unused int argc, __unused char **argv, __unused char **env) { const char warning[] = "ERROR: attempting to run a regular binary in capability mode!\n\nIf you want to run a binary in a sandbox, you must provide a cap_main() function, which takes the same arguments as main().\n"; write(2, warning, sizeof(warning)); + + return -1; } ==== //depot/projects/trustedbsd/capabilities/src/lib/csu/i386-elf/crt1.c#5 (text+ko) ==== @@ -43,7 +43,6 @@ extern void _fini(void); extern void _init(void); extern int main(int, char **, char **); -extern int cap_main(int, char **, char **) __attribute__((weak)); extern void _start(char *, ...); extern void _capstart(char *, ...); @@ -148,8 +147,8 @@ #endif atexit(_fini); #ifdef GCRT - monstartup(&eprol, &etext); -__asm__("eprol:"); +/* monstartup(&eprol, &etext); +__asm__("eprol:");*/ #endif _init(); exit( cap_main(argc, argv, env) ); From owner-p4-projects@FreeBSD.ORG Thu Nov 12 15:03:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31B711065694; Thu, 12 Nov 2009 15:03:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E78AA106566C for ; Thu, 12 Nov 2009 15:03:07 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D58408FC12 for ; Thu, 12 Nov 2009 15:03:07 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACF37PL070616 for ; Thu, 12 Nov 2009 15:03:07 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACF37kX070614 for perforce@freebsd.org; Thu, 12 Nov 2009 15:03:07 GMT (envelope-from raj@freebsd.org) Date: Thu, 12 Nov 2009 15:03:07 GMT Message-Id: <200911121503.nACF37kX070614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 15:03:08 -0000 http://p4web.freebsd.org/chv.cgi?CH=170548 Change 170548 by raj@raj_fdt on 2009/11/12 15:02:49 Adjust tests makefile to run on FreeBSD host. We pass all cases from the included testsuite: cd sys/contrib/dtc gmake gmake tests cd tests ./run_tests.sh << ... >> ********** TEST SUMMARY * Total testcases: 1248 * PASS: 1248 * FAIL: 0 * Bad configuration: 0 * Strange test result: 0 ********** Affected files ... .. //depot/projects/fdt/sys/contrib/dtc/tests/Makefile.tests#2 edit Differences ... ==== //depot/projects/fdt/sys/contrib/dtc/tests/Makefile.tests#2 (text+ko) ==== @@ -43,7 +43,7 @@ $(DL_LIB_TESTS): %: %.o $(TESTS_PREFIX)testutils.o $(LIBFDT_archive) @$(VECHO) LD [libdl] $@ - $(LINK.c) -o $@ $^ -ldl + $(LINK.c) -o $@ $^ $(LIBTREE_TESTS): %: $(TESTS_PREFIX)testutils.o $(TESTS_PREFIX)trees.o $(LIBFDT_archive) From owner-p4-projects@FreeBSD.ORG Thu Nov 12 16:21:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D3851065695; Thu, 12 Nov 2009 16:21:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5F4B106568F for ; Thu, 12 Nov 2009 16:21:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C38E28FC24 for ; Thu, 12 Nov 2009 16:21:26 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACGLQVj077285 for ; Thu, 12 Nov 2009 16:21:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACGLQiO077283 for perforce@freebsd.org; Thu, 12 Nov 2009 16:21:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 12 Nov 2009 16:21:26 GMT Message-Id: <200911121621.nACGLQiO077283@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170553 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 16:21:27 -0000 http://p4web.freebsd.org/chv.cgi?CH=170553 Change 170553 by hselasky@hselasky_laptop001 on 2009/11/12 16:20:44 USB audio: - remove volume alignment (was previously not correctly implemented) - reported by: Jaakko Heinonen, jh @ Affected files ... .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#61 edit Differences ... ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#61 (text+ko) ==== @@ -118,7 +118,6 @@ int32_t maxval; #define MIX_MAX_CHAN 8 int32_t wValue[MIX_MAX_CHAN]; /* using nchan */ - uint32_t mod; /* modulus */ uint32_t mul; uint32_t ctl; @@ -1573,9 +1572,7 @@ if (mc->type == MIX_ON_OFF) { mc->minval = 0; mc->maxval = 1; - mc->mod = 1; } else if (mc->type == MIX_SELECTOR) { - mc->mod = 1; } else { /* determine min and max values */ @@ -1603,11 +1600,8 @@ /* compute value alignment */ res = uaudio_mixer_get(sc->sc_udev, GET_RES, mc); - if (res == 0) - res = 1; - mc->mod = mc->mul / res; - if (mc->mod == 0) - mc->mod = 1; + + DPRINTF("Resolution = %d\n", (int)res); } uaudio_mixer_add_ctl_sub(sc, mc); @@ -3100,9 +3094,6 @@ /* compute actual volume */ val = (val * mc->mul) / 255; - /* align volume level */ - val = val - (val % mc->mod); - /* add lower offset */ val = val + mc->minval; From owner-p4-projects@FreeBSD.ORG Thu Nov 12 18:12:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02DA0106568F; Thu, 12 Nov 2009 18:12: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 A1113106568B for ; Thu, 12 Nov 2009 18:12:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B4408FC16 for ; Thu, 12 Nov 2009 18:12:20 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACICK7k097356 for ; Thu, 12 Nov 2009 18:12:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACICHBt097350 for perforce@freebsd.org; Thu, 12 Nov 2009 18:12:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 12 Nov 2009 18:12:17 GMT Message-Id: <200911121812.nACICHBt097350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170558 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 18:12:21 -0000 http://p4web.freebsd.org/chv.cgi?CH=170558 Change 170558 by rwatson@rwatson_vimage_client on 2009/11/12 18:11:34 Integrate TrustedBSD capabilities branch. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#11 integrate .. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#12 integrate .. //depot/projects/trustedbsd/capabilities/src/UPDATING#12 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cat/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/csh/iconv_stub.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ls/ls.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/keyword.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/arith_lex.l#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/expand.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/sh.1#7 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/trap.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/uuidgen/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ee/ee.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/libpcap/inet.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/ssh_namespace.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/crypto/openssh/sshd_config#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/defaults/rc.conf#11 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/gettytab#2 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/bgfsck#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/cleartmp#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/faith#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/fsck#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/hostid#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/hostname#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/jail#6 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/ldconfig#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/motd#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/moused#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netif#8 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/netoptions#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/newsyslog#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/nfsclient#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/pf#5 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/savecore#4 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.d/stf#3 integrate .. //depot/projects/trustedbsd/capabilities/src/etc/rc.subr#8 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes#10 integrate .. //depot/projects/trustedbsd/capabilities/src/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/trustedbsd/capabilities/src/games/number/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/games/number/number.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/gnu/lib/libgcov/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/kerberos5/lib/libgssapi_krb5/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/kerberos5/lib/libgssapi_spnego/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libbluetooth/bluetooth.3#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libbluetooth/bluetooth.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#14 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#16 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/errlst.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawn.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/posix_spawnattr_init.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/pselect.3#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/pselect.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/wordexp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/include/namespace.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/locale/isblank.3#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/net/ip6opt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/C.msg#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/ja_JP.UTF-8.msg#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/ja_JP.eucJP.msg#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/nls/uk_UA.UTF-8.msg#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/Symbol.map#18 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/accept.2#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/intro.2#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/mmap.2#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libc/sys/pselect.2#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libfetch/common.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libkvm/kvm_i386.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/libpmc.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libpmc/pmc_attach.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libstand/open.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libstand/udp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/arch/ia64/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/arch/ia64/ia64/_umtx_op_err.S#1 branch .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/arch/ia64/include/pthread_md.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/pthread.map#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libthr/thread/thr_syscalls.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb10.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb10_desc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb10_io.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb20.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb20_desc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/lib/libusb/libusb20_ugen20.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/release/doc/README#2 integrate .. //depot/projects/trustedbsd/capabilities/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/trustedbsd/capabilities/src/release/doc/share/mk/doc.relnotes.mk#2 integrate .. //depot/projects/trustedbsd/capabilities/src/release/doc/share/sgml/release.dsl#3 integrate .. //depot/projects/trustedbsd/capabilities/src/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/trustedbsd/capabilities/src/release/picobsd/bridge/PICOBSD#3 integrate .. //depot/projects/trustedbsd/capabilities/src/release/scripts/package-split.py#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/adjkerntz/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/atacontrol/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/atm/atmconfig/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/badsect/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/camcontrol/camcontrol.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ccdconfig/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/clri/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/comcontrol/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/conscontrol/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ddb/ddb_capture.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/bpf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/dhcpd.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dhclient/packet.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dmesg/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dump/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dumpfs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dumpfs/dumpfs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/dumpon/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/part/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/part/geom_part.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/geom/class/part/gpart.8#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ggate/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/growfs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/gvinum/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/af_nd6.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifconfig.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ifconfig/ifieee80211.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/init/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipf/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/iscontrol/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/kldunload/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ldconfig/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/md5/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mdconfig/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mdmfs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mknod/mknod.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mksnap_ffs/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount/mount.8#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_autofs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_cd9660/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_ext2fs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_msdosfs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_nfs/mount_nfs.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_nullfs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_reiserfs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/newfs_msdos/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/nfsiod/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/pfctl/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/rcorder/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/reboot/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/reboot/reboot.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/recoverdisk/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/routed/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/savecore/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/sconfig/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/shutdown/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/spppcontrol/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/swapon/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/tunefs/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/tunefs/tunefs.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/lib/libssh/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/secure/usr.bin/bdes/bdes.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/chpmon.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/eltsub.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/eltsub.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/getencstat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/getnobj.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/getobjmap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/getobjstat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/inienc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/sesd.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/setencstat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/examples/ses/srcs/setobjstat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man3/tree.3#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/Makefile#13 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/acpi_hp.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/acpi_wmi.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ata.4#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/atapicam.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/bce.4#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/bge.4#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/hifn.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/hptrr.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ichwd.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/iwn.4#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/iwnfw.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/lindev.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/mac_mls.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/malo.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/msk.4#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/netintro.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/targ.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/tty.4#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/umass.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/urtw.4#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/ar.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/make.conf.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man5/regdomain.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man7/adding_user.7#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/BUS_BIND_INTR.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/Makefile#11 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man9/get_cyclecount.9#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/bsd-family-tree#9 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/committers-src.dot#10 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/iso3166#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/misc/organization.dot#2 integrate .. //depot/projects/trustedbsd/capabilities/src/share/mk/bsd.sys.mk#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.SJIS.src#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.UTF-8.src#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/timedef/ja_JP.eucJP.src#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/antarctica#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/asia#10 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/australasia#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/europe#7 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/southamerica#8 integrate .. //depot/projects/trustedbsd/capabilities/src/share/zoneinfo/zone.tab#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/identcpu.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/initcpu.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/nexus.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/trap.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/amd64/vm_machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/ia32/ia32_signal.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/atomic.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/isa/isa_dma.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/trap.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/arm/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/at91/at91_machdep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/HL200#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/conf/KB920X#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/mv/mv_sata.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/boot.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/common/commands.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_all.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_pmp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/cam/ata/ata_xpt.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_ccb.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_periph.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_periph.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_queue.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_queue.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/cam_xpt_internal.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_sg.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/boot/zfs/zfsimpl.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/vnode.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_misc.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#20 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/syscalls.master#16 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/kern_windrv.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_ndis.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/ndis/subr_usbd.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/x86bios/x86bios_alloc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/conf/NOTES#14 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#20 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.amd64#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.i386#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files.ia64#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/options#15 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/changes.txt#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/adfile.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/adisasm.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/adwalk.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmextern.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtable.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acapps.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdebug.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acglobal.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpixf.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/LICENSE#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/iwlwifi-4965-228.57.2.23.fw.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/iwlwifi-5000-5.4.A.11.fw.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/x86emu/x86emu_util.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aac.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aacreg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/aac/aacvar.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_aiboost.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ahci/ahci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ahci/ahci.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/amr/amr.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/arcmsr/arcmsr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-all.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/ata-sata.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/atapi-tape.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-ahci.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-intel.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-nvidia.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-promise.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-serverworks.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-siliconimage.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ata/chipsets/ata-via.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/atkbdc/atkbd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bce/if_bce.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bce/if_bcereg.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bwi/if_bwi.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/cxgb/cxgb_main.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/dpms/dpms.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_pciids.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/drm_scatter.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/i915_drv.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/mach64_state.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/e1000/if_igb.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vesa.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fb/vgareg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fdc/fdc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hptrr/hptrr_osm_bsd.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_core.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ieee488/ibfoo.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/if_ndis/if_ndis_usb.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ips/ips_disk.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/iwn/if_iwn.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/iwn/if_iwnreg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ixgbe/ixgbe.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mii/miidevs#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mpt/mpt_raid.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/msk/if_mskreg.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mwl/if_mwl_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/mxge/if_mxge_var.h#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pci.c#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/re/if_re.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/siis/siis.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/siis/siis.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sym/sym_hipd.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/scterm-teken.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_ixp4xx.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_mbus.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_pci.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehcireg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_atmelarm.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_pci.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohcireg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci_pci.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhcireg.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/atp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/uhid.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ukbd.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdce.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uch341.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uchcom.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/umass.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdi.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rum.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uath.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgt.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_ural.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwreg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwvar.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zyd.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/vge/if_vgevar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/fifofs/fifo_vnops.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clport.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clstate.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clsubs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clvnops.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/smbfs/smbfs_vfsops.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/tmpfs/tmpfs.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/tmpfs/tmpfs_subr.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/label/g_label.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/shsec/g_shsec.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/geom/uzip/g_uzip.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/bios/apm.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/NOTES#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/initcpu.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/trap.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/atomic.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/isa/isa_dma.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_machdep.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/xen/pmap.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/conf/GENERIC#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/highfp.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/interrupt.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/asm.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/md_var.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/param.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/include/proc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/bus_if.m#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_main.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#41 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_context.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_cpuset.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_event.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#23 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#19 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_idle.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_jail.c#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_lock.c#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sig.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_thr.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_thread.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sched_ule.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/stack_protector.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_bus.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_log.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_prf.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_trap.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_generic.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_process.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#41 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.master#22 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#40 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sysv_shm.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty.c#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/tty_ttydisc.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_syscalls.c#17 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_acl.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_default.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_vnops.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/libkern/inet_aton.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/mips/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/pm_machdep.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/trap.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/mips/mips/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/Makefile#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/cam/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/dpms/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/ichwd/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/Makefile.inc#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/iwn4965/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/iwn5000/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/iwnfw/iwn5150/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/nfsclient/Makefile#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/pf/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/ubser/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/Makefile#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/atp/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/uch341/Makefile#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/modules/usb/ucom/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/vesa/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/x86bios/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/bpf.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/flowtable.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_bridge.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_ef.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_enc.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_gif.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_var.h#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/pfil.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/pfil.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_action.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_hwmp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_ioctl.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_output.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_proto.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/NOTES#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_eiface.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_fec.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_iface.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netgraph/ng_sppp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/if_ether.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.c#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fastfwd.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_icmp.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_input.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_ipsec.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_ipsec.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_output.c#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_var.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_dummynet.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw2.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw_pfil.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/libalias/alias.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/raw_ip.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_cc_functions.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_os_bsd.h#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/icmp6.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_ifattach.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_forward.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_output.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/ip6_var.h#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/nd6.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nfsclient/nfs_kdtrace.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nlm/nlm.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nlm/nlm_prot_impl.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nlm/nlm_prot_server.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/pc98/cbus/cbus_dma.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/pc98/cbus/scterm-sck.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/clock.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/copyinout.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/machdep.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/mmu_oea64.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/mp_cpudep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/platform_chrp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/swtch.S#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/trap.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/trap_subr.S#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/aim/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/machdep.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/mp_cpudep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/pmap.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/trap.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/booke/vm_machdep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/hid.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/pcpu.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/smp.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/include/spr.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powermac/hrowpic.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/cpu.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/mmu_if.m#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/mp_machdep.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/pmap_dispatch.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/stack_machdep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/powerpc/powerpc/uio_machdep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/rpc/clnt_vc.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/in_cksum.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/machdep.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sparc64/sparc64/vm_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/sun4v/machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/aac_ioctl.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/ata.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/bus.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/conf.h#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/errno.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/fbio.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/interrupt.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/kernel.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/ktrace.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/mman.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/msgbuf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/param.h#14 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/priv.h#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/proc.h#14 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sockio.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#41 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#41 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#41 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/time.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/ttyqueue.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/teken/sequences#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/teken/teken.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/teken/teken.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/tools/fw_stub.awk#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/tools/makeobjops.awk#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/pmap.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/swap_pager.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_extern.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_fault.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_glue.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_map.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_zeroidle.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/expansion/question1.0#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/expansion/set-u1.0#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/regression/bin/sh/expansion/set-u2.0#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/regression/fstest/tests/rename/21.t#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libc/gen/test-wordexp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-flopen.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-grp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-pidfile.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/lib/libutil/test-trimdomain.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/sigqueue/sigqtest1/sigqtest1.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/sigqueue/sigqtest2/sigqtest2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/regression/tmpfs/h_tools.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/tools/tools/netrate/netsend/netsend.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/gzip/unbzip2.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/leave/leave.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/locale/locale.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/logger/logger.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/make/job.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/make/main.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/netstat/route.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/systat/keyboard.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/systat/main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/tail/tail.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/touch/touch.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.bin/vmstat/vmstat.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/acpi/iasl/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/crashinfo/crashinfo.sh#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/i2c/i2c.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/jail/jail.8#7 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/nfsd/stablerestart.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/ntp/doc/ntpd.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/acpi.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/acpidump.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/biosmptable.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/cdrom.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/install.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/menus.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/sysinstall.8#5 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/sysinstall/tcpip.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/tzsetup/tzsetup.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/tzsetup/tzsetup.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/usbconfig/dump.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/usbconfig/usbconfig.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/vidcontrol/vidcontrol.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/vidcontrol/vidcontrol.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/wake/wake.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/zic/zdump.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/zic/zic.8#4 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/Makefile.inc1#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.633 2009/11/01 08:20:30 rdivacky Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -272,7 +272,7 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \ - -iprefix ${LIB32TMP}/usr/ \ + -isystem ${LIB32TMP}/usr/include/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 @@ -599,11 +599,14 @@ .if ${MK_INFO} != "no" _install-info= install-info .endif +.if ${MK_ZONEINFO} != "no" +_zoneinfo= zic tzsetup +.endif ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic + test true uname wc ${_zoneinfo} # # distributeworld @@ -929,6 +932,10 @@ _mklocale= usr.bin/mklocale .endif +.if ${BOOTSTRAPPING} < 900002 +_sed= usr.bin/sed +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -954,6 +961,7 @@ usr.bin/makewhatis \ ${_mklocale} \ usr.bin/rpcgen \ + ${_sed} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ @@ -1033,7 +1041,6 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ @@ -1122,7 +1129,7 @@ _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \ +kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ lib/libcrypt__L ==== //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091027: pselect.3 implemented as syscall +OLD_FILES+=usr/share/man/man3/pselect.3.gz +# 20091005: fusword.9 and susword.9 removed +OLD_FILES+=usr/share/man/man9/fusword.9.gz +OLD_FILES+=usr/share/man/man9/susword.9.gz # 20090909: vesa and dpms promoted to be i386/amd64 common OLD_FILES+=usr/include/machine/pc/vesa.h OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz @@ -26,6 +31,49 @@ OLD_FILES+=etc/mtree/BSD.local.dist OLD_FILES+=etc/mtree/BSD.x11.dist OLD_FILES+=etc/mtree/BSD.x11-4.dist +# 20090812: net80211 documentation overhaul +OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz +OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz # 20090801: vimage.h removed in favour of vnet.h OLD_FILES+=usr/include/sys/vimage.h # 20090719: library version bump for 8.0 @@ -503,6 +551,8 @@ OLD_FILES+=usr/include/dev/usb/usbcdc.h OLD_FILES+=usr/include/dev/usb/usbdivar.h OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h +OLD_FILES+=usr/sbin/usbdevs +OLD_FILES+=usr/share/man/man8/usbdevs.8.gz # 20090203: removal of pccard header files OLD_FILES+=usr/include/pccard/cardinfo.h OLD_FILES+=usr/include/pccard/cis.h ==== //depot/projects/trustedbsd/capabilities/src/UPDATING#12 (text+ko) ==== @@ -22,6 +22,19 @@ machines to maximize performance. (To disable malloc debugging, run >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 12 20:15:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ECF21065679; Thu, 12 Nov 2009 20:15: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 335281065672 for ; Thu, 12 Nov 2009 20:15:28 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 205D28FC08 for ; Thu, 12 Nov 2009 20:15:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nACKFSqF008765 for ; Thu, 12 Nov 2009 20:15:28 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nACKFRKu008763 for perforce@freebsd.org; Thu, 12 Nov 2009 20:15:27 GMT (envelope-from mav@freebsd.org) Date: Thu, 12 Nov 2009 20:15:27 GMT Message-Id: <200911122015.nACKFRKu008763@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170571 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Nov 2009 20:15:28 -0000 http://p4web.freebsd.org/chv.cgi?CH=170571 Change 170571 by mav@mav_mavbook on 2009/11/12 20:14:54 Fix several device freeze counting bugs. Assert correct reference counting instead of blindly ignoring problems. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#43 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#128 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#29 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#20 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#43 (text+ko) ==== @@ -981,15 +981,21 @@ { union ccb *saved_ccb; cam_status status; - int frozen; + int frozen = 0; int sense; struct scsi_start_stop_unit *scsi_cmd; u_int32_t relsim_flags, timeout; - int xpt_done_ccb; + int xpt_done_ccb = FALSE; - xpt_done_ccb = FALSE; status = done_ccb->ccb_h.status; - frozen = (status & CAM_DEV_QFRZN) != 0; + if (status & CAM_DEV_QFRZN) { + frozen = 1; + /* + * Clear freeze flag now for case of retry, + * freeze will be dropped later. + */ + done_ccb->ccb_h.status &= ~CAM_DEV_QFRZN; + } sense = (status & CAM_AUTOSNS_VALID) != 0; status &= CAM_STATUS_MASK; @@ -997,17 +1003,6 @@ relsim_flags = 0; saved_ccb = (union ccb *)done_ccb->ccb_h.saved_ccb_ptr; - /* - * Unfreeze the queue once if it is already frozen.. - */ - if (frozen != 0) { - cam_release_devq(done_ccb->ccb_h.path, - /*relsim_flags*/0, - /*openings*/0, - /*timeout*/0, - /*getcount_only*/0); - } - switch (status) { case CAM_REQ_CMP: { @@ -1184,14 +1179,33 @@ */ if (done_ccb->ccb_h.retry_count > 0) done_ccb->ccb_h.retry_count--; - + /* + * Drop freeze taken due to CAM_DEV_QFREEZE flag set on recovery + * request. + */ cam_release_devq(done_ccb->ccb_h.path, /*relsim_flags*/relsim_flags, /*openings*/0, /*timeout*/timeout, /*getcount_only*/0); - if (xpt_done_ccb == TRUE) + if (xpt_done_ccb == TRUE) { + /* + * Copy frozen flag from recovery request if it is set there + * for some reason. + */ + if (frozen != 0) + done_ccb->ccb_h.status |= CAM_DEV_QFRZN; (*done_ccb->ccb_h.cbfcnp)(periph, done_ccb); + } else { + /* Drop freeze taken, if this recovery request got error. */ + if (frozen != 0) { + cam_release_devq(done_ccb->ccb_h.path, + /*relsim_flags*/0, + /*openings*/0, + /*timeout*/0, + /*getcount_only*/0); + } + } } /* @@ -1451,6 +1465,11 @@ action_string = "No recovery CCB supplied"; goto sense_error_done; } + /* + * Clear freeze flag for original request here, as + * this freeze will be dropped as part of ERESTART. + */ + ccb->ccb_h.status &= ~CAM_DEV_QFRZN; bcopy(ccb, save_ccb, sizeof(*save_ccb)); print_ccb = save_ccb; periph->flags |= CAM_PERIPH_RECOVERY_INPROG; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#128 (text+ko) ==== @@ -4131,45 +4131,36 @@ static void xpt_release_devq_device(struct cam_ed *dev, u_int count, int run_queue) { - int rundevq; - rundevq = 0; - if (dev->ccbq.queue.qfrozen_cnt > 0) { - - count = (count > dev->ccbq.queue.qfrozen_cnt) ? - dev->ccbq.queue.qfrozen_cnt : count; - dev->ccbq.queue.qfrozen_cnt -= count; - if (dev->ccbq.queue.qfrozen_cnt == 0) { - - /* - * No longer need to wait for a successful - * command completion. - */ - dev->flags &= ~CAM_DEV_REL_ON_COMPLETE; - - /* - * Remove any timeouts that might be scheduled - * to release this queue. - */ - if ((dev->flags & CAM_DEV_REL_TIMEOUT_PENDING) != 0) { - callout_stop(&dev->callout); - dev->flags &= ~CAM_DEV_REL_TIMEOUT_PENDING; - } - - /* - * Now that we are unfrozen schedule the - * device so any pending transactions are - * run. - */ - if ((dev->ccbq.queue.entries > 0) - && (xpt_schedule_dev_sendq(dev->target->bus, dev)) - && (run_queue != 0)) { - rundevq = 1; - } + KASSERT(count <= dev->ccbq.queue.qfrozen_cnt, + ("xpt_release_devq: requested %u > present %u\n", + count, dev->ccbq.queue.qfrozen_cnt)); + dev->ccbq.queue.qfrozen_cnt -= count; + if (dev->ccbq.queue.qfrozen_cnt == 0) { + /* + * No longer need to wait for a successful + * command completion. + */ + dev->flags &= ~CAM_DEV_REL_ON_COMPLETE; + /* + * Remove any timeouts that might be scheduled + * to release this queue. + */ + if ((dev->flags & CAM_DEV_REL_TIMEOUT_PENDING) != 0) { + callout_stop(&dev->callout); + dev->flags &= ~CAM_DEV_REL_TIMEOUT_PENDING; + } + /* + * Now that we are unfrozen schedule the + * device so any pending transactions are + * run. + */ + if ((dev->ccbq.queue.entries > 0) + && (xpt_schedule_dev_sendq(dev->target->bus, dev)) + && (run_queue != 0)) { + xpt_run_dev_sendq(dev->target->bus); } } - if (rundevq != 0) - xpt_run_dev_sendq(dev->target->bus); } void @@ -4178,32 +4169,30 @@ struct camq *sendq; mtx_assert(sim->mtx, MA_OWNED); - sendq = &(sim->devq->send_queue); - if (sendq->qfrozen_cnt > 0) { + KASSERT(sendq->qfrozen_cnt > 0, + ("xpt_release_simq: requested 1 > present %u\n", + sendq->qfrozen_cnt)); + sendq->qfrozen_cnt--; + if (sendq->qfrozen_cnt == 0) { + /* + * If there is a timeout scheduled to release this + * sim queue, remove it. The queue frozen count is + * already at 0. + */ + if ((sim->flags & CAM_SIM_REL_TIMEOUT_PENDING) != 0){ + callout_stop(&sim->callout); + sim->flags &= ~CAM_SIM_REL_TIMEOUT_PENDING; + } + if (run_queue) { + struct cam_eb *bus; - sendq->qfrozen_cnt--; - if (sendq->qfrozen_cnt == 0) { /* - * If there is a timeout scheduled to release this - * sim queue, remove it. The queue frozen count is - * already at 0. + * Now that we are unfrozen run the send queue. */ - if ((sim->flags & CAM_SIM_REL_TIMEOUT_PENDING) != 0){ - callout_stop(&sim->callout); - sim->flags &= ~CAM_SIM_REL_TIMEOUT_PENDING; - } - - if (run_queue) { - struct cam_eb *bus; - - /* - * Now that we are unfrozen run the send queue. - */ - bus = xpt_find_bus(sim->path_id); - xpt_run_dev_sendq(bus); - xpt_release_bus(bus); - } + bus = xpt_find_bus(sim->path_id); + xpt_run_dev_sendq(bus); + xpt_release_bus(bus); } } } ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#29 (text+ko) ==== @@ -1570,7 +1570,8 @@ bp->bio_resid = bp->bio_bcount; bp->bio_error = error; bp->bio_flags |= BIO_ERROR; - cam_release_devq(done_ccb->ccb_h.path, + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(done_ccb->ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, @@ -1658,7 +1659,8 @@ struct ccb_getdev cgd; /* Don't wedge this device's queue */ - cam_release_devq(done_ccb->ccb_h.path, + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(done_ccb->ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#20 (text+ko) ==== @@ -606,7 +606,8 @@ retry_scheduled = 0; /* Don't wedge this device's queue */ - cam_release_devq(done_ccb->ccb_h.path, + if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(done_ccb->ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, From owner-p4-projects@FreeBSD.ORG Fri Nov 13 22:38:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60F6C1065679; Fri, 13 Nov 2009 22:38:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 259D91065672 for ; Fri, 13 Nov 2009 22:38:36 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 136518FC08 for ; Fri, 13 Nov 2009 22:38:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nADMcZpj020667 for ; Fri, 13 Nov 2009 22:38:35 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nADMcZ5a020665 for perforce@freebsd.org; Fri, 13 Nov 2009 22:38:35 GMT (envelope-from mav@freebsd.org) Date: Fri, 13 Nov 2009 22:38:35 GMT Message-Id: <200911132238.nADMcZ5a020665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2009 22:38:36 -0000 http://p4web.freebsd.org/chv.cgi?CH=170602 Change 170602 by mav@mav_mavtest on 2009/11/13 22:38:16 Do not enable tagged commands if controller does't support tags. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#57 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#57 (text+ko) ==== @@ -719,7 +719,8 @@ /* XXX: If not all tags allowed, we must to tell SIM which are. */ if (path->device->mintags < path->bus->sim->max_tagged_dev_openings) path->device->mintags = path->device->maxtags = 0; - if (path->device->mintags != 0) { + if (path->device->mintags != 0 && + path->bus->sim->max_tagged_dev_openings != 0) { xpt_start_tags(path); } ata_device_transport(path); From owner-p4-projects@FreeBSD.ORG Sat Nov 14 08:31:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED3EB1065692; Sat, 14 Nov 2009 08:31:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF92A106566C for ; Sat, 14 Nov 2009 08:31:28 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D7A28FC15 for ; Sat, 14 Nov 2009 08:31:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAE8VSts094459 for ; Sat, 14 Nov 2009 08:31:28 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAE8VSga094457 for perforce@freebsd.org; Sat, 14 Nov 2009 08:31:28 GMT (envelope-from mav@freebsd.org) Date: Sat, 14 Nov 2009 08:31:28 GMT Message-Id: <200911140831.nAE8VSga094457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2009 08:31:29 -0000 http://p4web.freebsd.org/chv.cgi?CH=170610 Change 170610 by mav@mav_mavtest on 2009/11/14 08:31:22 Honor HBA SNCQ capability bit whan reporting NCQ support. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#79 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#79 (text+ko) ==== @@ -734,7 +734,9 @@ /* Construct SIM entry */ ch->sim = cam_sim_alloc(ahciaction, ahcipoll, "ahcich", ch, device_get_unit(dev), &ch->mtx, - min(2, ch->numslots), ch->numslots, devq); + min(2, ch->numslots), + (ch->caps & AHCI_CAP_SNCQ) ? ch->numslots : 0, + devq); if (ch->sim == NULL) { device_printf(dev, "unable to allocate sim\n"); error = ENOMEM; @@ -2119,7 +2121,9 @@ struct ccb_pathinq *cpi = &ccb->cpi; cpi->version_num = 1; /* XXX??? */ - cpi->hba_inquiry = PI_SDTR_ABLE | PI_TAG_ABLE; + cpi->hba_inquiry = PI_SDTR_ABLE; + if (ch->caps & AHCI_CAP_SNCQ) + cpi->hba_inquiry |= PI_TAG_ABLE; if (ch->caps & AHCI_CAP_SPM) cpi->hba_inquiry |= PI_SATAPM; cpi->target_sprt = 0; From owner-p4-projects@FreeBSD.ORG Sat Nov 14 13:55:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 046C21065672; Sat, 14 Nov 2009 13:55: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 BA7CC106566B for ; Sat, 14 Nov 2009 13:55:52 +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 A7C758FC1E for ; Sat, 14 Nov 2009 13:55:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAEDtqk5043380 for ; Sat, 14 Nov 2009 13:55:52 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAEDtqrd043378 for perforce@freebsd.org; Sat, 14 Nov 2009 13:55:52 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 14 Nov 2009 13:55:52 GMT Message-Id: <200911141355.nAEDtqrd043378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2009 13:55:53 -0000 http://p4web.freebsd.org/chv.cgi?CH=170613 Change 170613 by hselasky@hselasky_laptop001 on 2009/11/14 13:55:00 USB CORE: - fix compilation without power daemon Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#23 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#35 (text+ko) ==== @@ -214,12 +214,13 @@ USB_BUS_UNLOCK(bus); +#if USB_HAVE_POWERD /* * First update the USB power state! */ usb_bus_powerd(bus); - - /* Explore the Root USB HUB. */ +#endif + /* Explore the Root USB HUB. */ (udev->hub->explore) (udev); USB_BUS_LOCK(bus); } @@ -275,11 +276,13 @@ */ usb_proc_rewakeup(&bus->explore_proc); /* recover from DDB */ +#if USB_HAVE_POWERD USB_BUS_UNLOCK(bus); usb_bus_power_update(bus); USB_BUS_LOCK(bus); +#endif } /*------------------------------------------------------------------------* ==== //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#23 (text+ko) ==== @@ -438,8 +438,10 @@ USB_BUS_UNLOCK(bus); +#if USB_HAVE_POWERD /* In case we are out of sync, update the power state. */ usb_bus_power_update(udev->bus); +#endif return (0); /* success */ } From owner-p4-projects@FreeBSD.ORG Sat Nov 14 14:50:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 536561065670; Sat, 14 Nov 2009 14:50:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15D39106566B for ; Sat, 14 Nov 2009 14:50:48 +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 034CF8FC28 for ; Sat, 14 Nov 2009 14:50:48 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAEEolIP048562 for ; Sat, 14 Nov 2009 14:50:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAEEolwc048560 for perforce@freebsd.org; Sat, 14 Nov 2009 14:50:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 14 Nov 2009 14:50:47 GMT Message-Id: <200911141450.nAEEolwc048560@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170616 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2009 14:50:48 -0000 http://p4web.freebsd.org/chv.cgi?CH=170616 Change 170616 by hselasky@hselasky_laptop001 on 2009/11/14 14:50:39 USB CORE: - fix compiler warnings Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#58 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#58 (text+ko) ==== @@ -2190,12 +2190,12 @@ #ifdef USB_VERBOSE const struct usb_knowndev *kdp; #endif - uint8_t *temp_ptr; + char *temp_ptr; size_t temp_size; uint16_t vendor_id; uint16_t product_id; - temp_ptr = udev->bus->scratch[0].data; + temp_ptr = (char *)udev->bus->scratch[0].data; temp_size = sizeof(udev->bus->scratch[0].data); vendor_id = UGETW(udd->idVendor); From owner-p4-projects@FreeBSD.ORG Sat Nov 14 19:07:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 088A11065672; Sat, 14 Nov 2009 19:07:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C03B1106566C for ; Sat, 14 Nov 2009 19:07:04 +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 ADC788FC18 for ; Sat, 14 Nov 2009 19:07:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAEJ74jH083746 for ; Sat, 14 Nov 2009 19:07:04 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAEJ74Sp083744 for perforce@freebsd.org; Sat, 14 Nov 2009 19:07:04 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 14 Nov 2009 19:07:04 GMT Message-Id: <200911141907.nAEJ74Sp083744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170623 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2009 19:07:05 -0000 http://p4web.freebsd.org/chv.cgi?CH=170623 Change 170623 by hselasky@hselasky_laptop001 on 2009/11/14 19:06:55 USB controller: - fix compile warnings for latest version of GCC 4.x Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#29 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#29 (text+ko) ==== @@ -894,6 +894,7 @@ /* setup temp */ + temp.pc = NULL; temp.td = NULL; temp.td_next = xfer->td_start[0]; temp.offset = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#41 (text+ko) ==== @@ -797,6 +797,7 @@ /* setup temp */ + temp.pc = NULL; temp.td = NULL; temp.td_next = xfer->td_start[0]; temp.offset = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#14 (text+ko) ==== @@ -767,6 +767,7 @@ /* setup temp */ + temp.pc = NULL; temp.td = NULL; temp.td_next = xfer->td_start[0]; temp.offset = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#27 (text+ko) ==== @@ -1144,6 +1144,7 @@ /* setup temp */ + temp.pc = NULL; temp.td = NULL; temp.td_next = xfer->td_start[0]; temp.offset = 0; ==== //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#29 (text+ko) ==== @@ -858,6 +858,7 @@ /* setup temp */ + temp.pc = NULL; temp.td = NULL; temp.td_next = xfer->td_start[0]; temp.offset = 0; From owner-p4-projects@FreeBSD.ORG Sat Nov 14 19:48:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D72A1065676; Sat, 14 Nov 2009 19:48: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 D51F71065670 for ; Sat, 14 Nov 2009 19:48:46 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C13208FC14 for ; Sat, 14 Nov 2009 19:48:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAEJmkel086657 for ; Sat, 14 Nov 2009 19:48:46 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAEJmk4l086655 for perforce@freebsd.org; Sat, 14 Nov 2009 19:48:46 GMT (envelope-from mav@freebsd.org) Date: Sat, 14 Nov 2009 19:48:46 GMT Message-Id: <200911141948.nAEJmk4l086655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2009 19:48:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=170625 Change 170625 by mav@mav_mavbook on 2009/11/14 19:48:04 IFC Affected files ... .. //depot/projects/scottl-camlock/src/UPDATING#22 integrate .. //depot/projects/scottl-camlock/src/bin/sh/trap.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/libpcap/inet.c#3 integrate .. //depot/projects/scottl-camlock/src/etc/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/etc/etc.amd64/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.arm/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.i386/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.ia64/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.mips/ttys#3 integrate .. //depot/projects/scottl-camlock/src/etc/etc.powerpc/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/etc.sparc64/ttys#4 integrate .. //depot/projects/scottl-camlock/src/etc/root/dot.profile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/locale/isgraph.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/locale/isprint.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/getnameinfo.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/net/ip6opt.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_unix/pam_unix.8#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/etc/ttys#3 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/tinyware/oinit/oinit.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/netintro.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/snd_hda.4#3 integrate .. //depot/projects/scottl-camlock/src/share/misc/organization.dot#2 integrate .. //depot/projects/scottl-camlock/src/share/skel/dot.profile#3 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.SJIS.src#5 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.UTF-8.src#5 integrate .. //depot/projects/scottl-camlock/src/share/timedef/ja_JP.eucJP.src#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/initcpu.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/machdep.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#36 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/md_var.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/Makefile.inc#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/boot.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#58 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#43 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#55 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#37 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/ahd_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-marvell.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_aq100x.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vgareg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/vga_pci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/identcpu.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/initcpu.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#37 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#27 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_action.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/libalias/alias_proxy.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/nd6.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_fha.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/cbus/cbus_dma.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#33 integrate .. //depot/projects/scottl-camlock/src/sys/sys/priv.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sockio.h#11 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-flopen.c#5 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-grp.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-trimdomain-nodomain.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-trimdomain.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/gateworks/Files/root/.profile#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/rescue/Files/etc/ttys#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/tinybsd/conf/wrap/etc/ttys#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gencat/gencat.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/main.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sade/termcap.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/termcap.c#3 integrate Differences ... ==== //depot/projects/scottl-camlock/src/UPDATING#22 (text+ko) ==== @@ -22,6 +22,21 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091113: + The default terminal emulation for syscons(4) has been changed + from cons25 to xterm on all platforms except pc98. This means + that the /etc/ttys file needs to be updated to ensure correct + operation of applications on the console. + + The terminal emulation style can be toggled per window by using + vidcontrol(1)'s -T flag. The TEKEN_CONS25 kernel configuration + options can be used to change the compile-time default back to + cons25. + + To prevent graphical artifacts, make sure the TERM environment + variable is set to match the terminal emulation that is being + performed by syscons(4). + 20091109: The layout of the structure ieee80211req_scan_result has changed. Applications that require wireless scan results (e.g. ifconfig(8)) @@ -1057,4 +1072,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.645 2009/11/09 16:05:32 rpaulo Exp $ +$FreeBSD: src/UPDATING,v 1.647 2009/11/13 11:28:54 ed Exp $ ==== //depot/projects/scottl-camlock/src/bin/sh/trap.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.34 2009/06/13 21:10:41 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.35 2009/11/11 23:13:24 jilles Exp $"); #include #include @@ -244,7 +244,8 @@ setsignal(int signo) { int action; - sig_t sig, sigact = SIG_DFL; + sig_t sigact = SIG_DFL; + struct sigaction sa; char *t; if ((t = trap[signo]) == NULL) @@ -320,9 +321,10 @@ case S_IGN: sigact = SIG_IGN; break; } *t = action; - sig = signal(signo, sigact); - if (sig != SIG_ERR && action == S_CATCH) - siginterrupt(signo, 1); + sa.sa_handler = sigact; + sa.sa_flags = 0; + sigemptyset(&sa.sa_mask); + sigaction(signo, &sa, NULL); } ==== //depot/projects/scottl-camlock/src/contrib/libpcap/inet.c#3 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/etc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.376 2009/09/02 14:54:47 flz Exp $ +# $FreeBSD: src/etc/Makefile,v 1.377 2009/11/13 11:26:44 ed Exp $ .include @@ -18,8 +18,13 @@ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ - sysctl.conf syslog.conf \ - etc.${MACHINE_ARCH}/ttys + sysctl.conf syslog.conf + +.if exists(${.CURDIR}/etc.${MACHINE}/ttys) +BIN1+= etc.${MACHINE}/ttys +.else +BIN1+= etc.${MACHINE_ARCH}/ttys +.endif OPENBSMDIR= ${.CURDIR}/../contrib/openbsm BSM_ETC_OPEN_FILES= ${OPENBSMDIR}/etc/audit_class \ ==== //depot/projects/scottl-camlock/src/etc/etc.amd64/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.amd64/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.amd64/ttys,v 1.19 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.arm/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.arm/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.arm/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 off secure +ttyv0 "/usr/libexec/getty Pc" xterm off secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 off secure -ttyv2 "/usr/libexec/getty Pc" cons25 off secure -ttyv3 "/usr/libexec/getty Pc" cons25 off secure -ttyv4 "/usr/libexec/getty Pc" cons25 off secure -ttyv5 "/usr/libexec/getty Pc" cons25 off secure -ttyv6 "/usr/libexec/getty Pc" cons25 off secure -ttyv7 "/usr/libexec/getty Pc" cons25 off secure +ttyv1 "/usr/libexec/getty Pc" xterm off secure +ttyv2 "/usr/libexec/getty Pc" xterm off secure +ttyv3 "/usr/libexec/getty Pc" xterm off secure +ttyv4 "/usr/libexec/getty Pc" xterm off secure +ttyv5 "/usr/libexec/getty Pc" xterm off secure +ttyv6 "/usr/libexec/getty Pc" xterm off secure +ttyv7 "/usr/libexec/getty Pc" xterm off secure #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.i386/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.i386/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.i386/ttys,v 1.19 2009/11/13 11:28:54 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.ia64/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.ia64/ttys,v 1.12 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.ia64/ttys,v 1.13 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 off secure -# Virtual terminals. -ttyv1 "/usr/libexec/getty Pc" cons25 off secure -ttyv2 "/usr/libexec/getty Pc" cons25 off secure -ttyv3 "/usr/libexec/getty Pc" cons25 off secure -ttyv4 "/usr/libexec/getty Pc" cons25 off secure -ttyv5 "/usr/libexec/getty Pc" cons25 off secure -ttyv6 "/usr/libexec/getty Pc" cons25 off secure -ttyv7 "/usr/libexec/getty Pc" cons25 off secure +ttyv0 "/usr/libexec/getty Pc" xterm off secure +# Virtual terminals +ttyv1 "/usr/libexec/getty Pc" xterm off secure +ttyv2 "/usr/libexec/getty Pc" xterm off secure +ttyv3 "/usr/libexec/getty Pc" xterm off secure +ttyv4 "/usr/libexec/getty Pc" xterm off secure +ttyv5 "/usr/libexec/getty Pc" xterm off secure +ttyv6 "/usr/libexec/getty Pc" xterm off secure +ttyv7 "/usr/libexec/getty Pc" xterm off secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals. The 'dialup' keyword identifies dialin lines to login, # fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.mips/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.mips/ttys,v 1.6 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.mips/ttys,v 1.7 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. ==== //depot/projects/scottl-camlock/src/etc/etc.powerpc/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -30,15 +30,15 @@ # when going to single-user mode. console none unknown off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure #ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/etc.sparc64/ttys#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.20 2009/06/14 22:35:33 ed Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.21 2009/11/13 05:54:55 ed Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -15,7 +15,7 @@ # # type The initial terminal type for this port. For hardwired # terminal lines, this will contain the type of terminal used. -# For virtual consoles, the correct type is typically cons25. +# For virtual consoles, the correct type is typically xterm. # Other common values include network for network connections on # pseudo-terminals, dialup for incoming modem ports, and unknown # when the terminal type cannot be predetermined. @@ -34,15 +34,15 @@ ttya "/usr/libexec/getty 3wire.9600" vt100 off secure ttyb "/usr/libexec/getty 3wire.9600" vt100 off secure # syscons(4) -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ==== //depot/projects/scottl-camlock/src/etc/root/dot.profile#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/etc/root/dot.profile,v 1.21 2007/05/29 06:33:10 dougb Exp $ +# $FreeBSD: src/etc/root/dot.profile,v 1.22 2009/11/13 05:54:55 ed Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin export PATH HOME=/root export HOME -TERM=${TERM:-cons25} +TERM=${TERM:-xterm} export TERM PAGER=more export PAGER ==== //depot/projects/scottl-camlock/src/lib/libc/locale/isgraph.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isgraph.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.24 2009/09/04 07:44:58 des Exp $ +.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.25 2009/11/13 09:03:50 roam Exp $ .\" .Dd July 17, 2005 .Dt ISGRAPH 3 @@ -50,7 +50,7 @@ function tests for any printing character except space .Pq Ql "\ " and other -locale specific space-like characters. +locale-specific space-like characters. The value of the argument must be representable as an .Vt "unsigned char" or the value of ==== //depot/projects/scottl-camlock/src/lib/libc/locale/isprint.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)isprint.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.25 2009/09/04 07:44:58 des Exp $ +.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.26 2009/11/13 09:07:33 roam Exp $ .\" .Dd July 17, 2005 .Dt ISPRINT 3 @@ -47,7 +47,7 @@ .Sh DESCRIPTION The .Fn isprint -function tests for any printing character including space +function tests for any printing character, including space .Pq Ql "\ " . The value of the argument must be representable as an .Vt "unsigned char" ==== //depot/projects/scottl-camlock/src/lib/libc/net/getnameinfo.c#2 (text+ko) ==== @@ -45,13 +45,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.20 2007/02/28 21:18:38 bms Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.21 2009/11/12 11:54:12 ume Exp $"); #include #include #include #include #include +#include #include #include #include @@ -385,6 +386,7 @@ { const struct sockaddr_dl *sdl = (const struct sockaddr_dl *)(const void *)sa; + const struct fw_hwaddr *iha; int n; if (serv != NULL && servlen > 0) @@ -400,6 +402,15 @@ } switch (sdl->sdl_type) { + case IFT_IEEE1394: + if (sdl->sdl_alen < sizeof(iha->sender_unique_ID_hi) + + sizeof(iha->sender_unique_ID_lo)) + return EAI_FAMILY; + iha = (const struct fw_hwaddr *)(const void *)LLADDR(sdl); + return hexname((const u_int8_t *)&iha->sender_unique_ID_hi, + sizeof(iha->sender_unique_ID_hi) + + sizeof(iha->sender_unique_ID_lo), + host, hostlen); /* * The following have zero-length addresses. * IFT_ATM (net/if_atmsubr.c) ==== //depot/projects/scottl-camlock/src/lib/libc/net/ip6opt.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.8 2005/07/19 18:13:58 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.9 2009/11/11 15:21:06 ume Exp $"); #include #include @@ -55,8 +55,7 @@ * byte, the length byte, and the option data. */ int -inet6_option_space(nbytes) - int nbytes; +inet6_option_space(int nbytes) { nbytes += 2; /* we need space for nxt-hdr and length fields */ return(CMSG_SPACE((nbytes + 7) & ~7)); @@ -68,10 +67,7 @@ * success or -1 on an error. */ int -inet6_option_init(bp, cmsgp, type) - void *bp; - struct cmsghdr **cmsgp; - int type; +inet6_option_init(void *bp, struct cmsghdr **cmsgp, int type) { struct cmsghdr *ch = (struct cmsghdr *)bp; @@ -98,11 +94,8 @@ * earlier. It must have a value between 0 and 7, inclusive. */ int -inet6_option_append(cmsg, typep, multx, plusy) - struct cmsghdr *cmsg; - const u_int8_t *typep; - int multx; - int plusy; +inet6_option_append(struct cmsghdr *cmsg, const u_int8_t *typep, int multx, + int plusy) { int padlen, optlen, off; u_char *bp = (u_char *)cmsg + cmsg->cmsg_len; @@ -171,11 +164,7 @@ * */ u_int8_t * -inet6_option_alloc(cmsg, datalen, multx, plusy) - struct cmsghdr *cmsg; - int datalen; - int multx; - int plusy; +inet6_option_alloc(struct cmsghdr *cmsg, int datalen, int multx, int plusy) { int padlen, off; u_int8_t *bp = (u_char *)cmsg + cmsg->cmsg_len; @@ -238,9 +227,7 @@ * (RFC 2292, 6.3.5) */ int -inet6_option_next(cmsg, tptrp) - const struct cmsghdr *cmsg; - u_int8_t **tptrp; +inet6_option_next(const struct cmsghdr *cmsg, u_int8_t **tptrp) { struct ip6_ext *ip6e; int hdrlen, optlen; @@ -296,10 +283,7 @@ * it's a typo. The variable should be type of u_int8_t **. */ int -inet6_option_find(cmsg, tptrp, type) - const struct cmsghdr *cmsg; - u_int8_t **tptrp; - int type; +inet6_option_find(const struct cmsghdr *cmsg, u_int8_t **tptrp, int type) { struct ip6_ext *ip6e; int hdrlen, optlen; @@ -352,8 +336,7 @@ * calculated length and the limitation of the buffer. */ static int -ip6optlen(opt, lim) - u_int8_t *opt, *lim; +ip6optlen(u_int8_t *opt, u_int8_t *lim) { int optlen; ==== //depot/projects/scottl-camlock/src/lib/libc/nls/nl_NL.ISO8859-1.msg#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$ $FreeBSD: src/lib/libc/nls/nl_NL.ISO8859-1.msg,v 1.1 2009/03/13 10:40:38 gabor Exp $ +$ $FreeBSD: src/lib/libc/nls/nl_NL.ISO8859-1.msg,v 1.2 2009/11/11 18:28:12 rene Exp $ $ $ Message catalog for nl_NL.ISO8859-1 locale $ @@ -26,7 +26,7 @@ $ ECHILD 10 Geen kindprocessen $ EDEADLK -11 Een deadlock is vermeden +11 Een deadlock op een bron is vermeden $ ENOMEM 12 Kan geen geheugen meer verkrijgen $ EACCES @@ -40,13 +40,13 @@ $ EEXIST 17 Bestand bestaat reeds $ EXDEV -18 Verwijzing tussen bestanden op verschillende bestandssystemen +18 Verwijzing tussen verschillende apparaten $ ENODEV 19 Bewerking wordt niet ondersteund door dit apparaat $ ENOTDIR 20 Dit is geen map $ EISDIR -21 Dit is een map +21 Dit is een map $ EINVAL 22 Ongeldig argument $ ENFILE @@ -62,7 +62,7 @@ $ ENOSPC 28 Geen ruimte meer op dit apparaat $ ESPIPE -29 Onuitvoerbare zoekopdracht +29 Ongeldige zoekopdracht $ EROFS 30 Van dit bestandssysteem kan alleen worden gelezen $ EMLINK @@ -84,7 +84,7 @@ $ EDESTADDRREQ 39 Een bestemmingsadres is vereist $ EMSGSIZE -40 Te grote bericht +40 Te groot bericht $ EPROTOTYPE 41 Protocol past niet bij dit contactpunt $ ENOPROTOOPT @@ -116,7 +116,7 @@ $ ENOBUFS 55 Geen bufferruimte meer beschikbaar $ EISCONN -56 Dit contactpunt is al verbonden +56 Contactpunt is al verbonden $ ENOTCONN 57 Contactpunt is niet verbonden $ ESHUTDOWN @@ -136,9 +136,9 @@ $ EHOSTUNREACH 65 Bestemming niet bereikbaar $ ENOTEMPTY -66 Directory is niet leeg +66 Map is niet leeg $ EPROCLIM -67 Te veel taken +67 Te veel processen $ EUSERS 68 Te veel gebruikers $ EDQUOT @@ -160,7 +160,7 @@ $ ENOLCK 77 Geen sloten beschikbaar $ ENOSYS -78 Deze systeemfunctie is niet geimplementeerd +78 Systeemfunctie is niet geimplementeerd $ EFTYPE 79 Bestandsformaat niet van toepassing $ EAUTH @@ -173,30 +173,24 @@ 83 Geen bericht van het gewenste type $ EOVERFLOW 84 Waarde te groot om te bewaren in gegevenstype +$ ECANCELED +85 Bewerking geannuleerd $ EILSEQ -85 Ongeldige bytereeks -$ ENOTSUP -86 Niet ondersteund -$ ECANCELED -87 Bewerking geannuleerd +86 Ongeldige bytereeks +$ ENOATTR +87 Attribuut niet gevonden +$ EDOOFUS +88 Programmeerfout $ EBADMSG -88 Verkeerd of defect bericht -$ ENODATA -89 Geen bericht beschikbaar -$ ENOSR -90 Geen STREAM-voorraad -$ ENOSTR -91 Dit is geen STREAM -$ ETIME -92 STREAM-ioctl verlopen -$ ENOATTR -93 Attribuut niet gevonden +89 Verkeerd of defect bericht $ EMULTIHOP -94 Multihopverzoek +90 Multihopverzoek $ ENOLINK -95 Verbinding werd verstoord +91 Verbinding werd verstoord $ EPROTO -96 Protocolfout +92 Protocolfout +$ ENOTCAPABLE +93 Onvoldoende mogelijkheden $ $ strsignal() support catalog $ @@ -263,5 +257,38 @@ 30 Gebruikersignaal 1 $ SIGUSR2 31 Gebruikersignaal 2 -$ SIGPWR -32 Stroomuitval/stroominschakeling +$ +$ gai_strerror() support catalog +$set 3 +$ 1 (obsolete) +1 Adresfamilie voor hostnaam niet ondersteund +$ EAI_AGAIN +2 Tijdelijke fout in naamresolutie +$ EAI_BADFLAGS +3 Ongeldige waarde voor ai_flags +$ EAI_FAIL +4 Onherstelbare fout in naamresolutie +$ EAI_FAMILY +5 ai_familie niet ondersteund +$ EAI_MEMORY +6 Geheugenallocatiefout +$ 7 (obsolete) +7 Geen adres met hostnaam geassocieerd +$ EAI_NONAME +8 hostname noch servname gegeven, of onbekend +$ EAI_SERVICE +9 servname niet ondersteund voor ai_socktype +$ EAI_SOCKTYPE +10 ai_socktype niet ondersteund +$ EAI_SYSTEM +11 Systeemfout geretourneerd in errno +$ EAI_BADHINTS +12 Ongeldige waarde voor hints +$ EAI_PROTOCOL +13 Opgelost protocol is onbekend +$ EAI_OVERFLOW +14 Argumentbuffer overstroomd +$ 0 +32766 Succes +$ NL_MSGMAX +32767 Onbekende fout ==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#6 (text+ko) ==== @@ -156,7 +156,7 @@ #define MALLOC_DSS #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.185 2009/09/26 18:20:40 alc Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.186 2009/11/14 09:31:47 cperciva Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -5116,7 +5116,7 @@ arena_maxclass = chunksize - (arena_chunk_header_npages << PAGE_SHIFT); - UTRACE(0, 0, 0); + UTRACE((void *)(intptr_t)(-1), 0, 0); #ifdef MALLOC_STATS memset(&stats_chunks, 0, sizeof(chunk_stats_t)); ==== //depot/projects/scottl-camlock/src/lib/libc/sys/vfork.2#2 (text+ko) ==== @@ -26,14 +26,14 @@ .\" SUCH DAMAGE. .\" .\" @(#)vfork.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.27 2007/01/09 00:28:16 imp Exp $ +.\" $FreeBSD: src/lib/libc/sys/vfork.2,v 1.29 2009/11/13 13:26:27 brueffer Exp $ .\" -.Dd June 4, 1993 +.Dd November 13, 2009 .Dt VFORK 2 .Os .Sh NAME .Nm vfork -.Nd spawn new process in a virtual memory efficient way +.Nd create a new process without copying the address space .Sh LIBRARY .Lb libc .Sh SYNOPSIS @@ -113,14 +113,6 @@ system call appeared in .Bx 2.9 . .Sh BUGS -This system call will be eliminated when proper system sharing -mechanisms are implemented. -Users should not depend on the memory -sharing semantics of -.Fn vfork -as it will, in that case, be made synonymous to -.Xr fork 2 . -.Pp To avoid a possible deadlock situation, processes that are children in the middle of a ==== //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_unix/pam_unix.8#3 (text+ko) ==== @@ -32,7 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.15 2009/06/20 10:09:59 des Exp $ +.\" $FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.8,v 1.16 2009/11/13 11:19:26 des Exp $ .\" .Dd June 20, 2009 .Dt PAM_UNIX 8 @@ -105,6 +105,17 @@ If the password database has no password for the entity being authenticated, then this option will forgo password prompting, and silently allow authentication to succeed. +.Pp +.Sy NOTE: +If +.Nm +is invoked by a process that does not have the privileges required to +access the password database (in most cases, this means root +privileges), the +.Cm nullok +option may cause +.Nm +to allow any user to log in with any password. .It Cm local_pass Use only the local password database, even if NIS is in use. This will cause an authentication failure if the system is configured ==== //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.140 2009/10/10 15:27:10 kib Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.141 2009/11/14 15:08:44 rwatson Exp $ */ /* @@ -3425,7 +3425,7 @@ if (object_match_name(needed->obj, name)) return needed->obj; } - _rtld_error("%s: Unexpected inconsistency: dependency %s not found", + _rtld_error("%s: Unexpected inconsistency: dependency %s not found", obj->path, name); die(); } ==== //depot/projects/scottl-camlock/src/release/picobsd/floppy.tree/etc/ttys#3 (text+ko) ==== @@ -1,26 +1,26 @@ # # @(#)ttys 5.1 (Berkeley) 4/17/89 # -# $FreeBSD: src/release/picobsd/floppy.tree/etc/ttys,v 1.5 2009/02/19 23:29:05 luigi Exp $ +# $FreeBSD: src/release/picobsd/floppy.tree/etc/ttys,v 1.6 2009/11/13 11:32:14 ed Exp $ # # name getty type status comments # # This entry needed for asking password when init goes to single-user mode # If you want to be asked for password, change "secure" to "insecure" here #console none unknown off secure -vga none cons25 off secure +vga none xterm off secure # -ttyv0 "/usr/libexec/getty Pc" cons25 on secure +ttyv0 "/usr/libexec/getty Pc" xterm on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 on secure -ttyv4 "/usr/libexec/getty Pc" cons25 on secure -ttyv5 "/usr/libexec/getty Pc" cons25 on secure -ttyv6 "/usr/libexec/getty Pc" cons25 on secure -ttyv7 "/usr/libexec/getty Pc" cons25 on secure -#ttyv8 "/usr/libexec/getty Pc" cons25 on secure -#ttyv9 "/usr/libexec/getty Pc" cons25 on secure +ttyv1 "/usr/libexec/getty Pc" xterm on secure +ttyv2 "/usr/libexec/getty Pc" xterm on secure +ttyv3 "/usr/libexec/getty Pc" xterm on secure +ttyv4 "/usr/libexec/getty Pc" xterm on secure +ttyv5 "/usr/libexec/getty Pc" xterm on secure +ttyv6 "/usr/libexec/getty Pc" xterm on secure +ttyv7 "/usr/libexec/getty Pc" xterm on secure +#ttyv8 "/usr/libexec/getty Pc" xterm on secure +#ttyv9 "/usr/libexec/getty Pc" xterm on secure # Pseudo terminals ttyp0 none network secure >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 14 20:46:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8A221065694; Sat, 14 Nov 2009 20:46:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9C3B31065692 for ; Sat, 14 Nov 2009 20:46:45 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 894748FC0A for ; Sat, 14 Nov 2009 20:46:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAEKkjpc091927 for ; Sat, 14 Nov 2009 20:46:45 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAEKkjSg091925 for perforce@freebsd.org; Sat, 14 Nov 2009 20:46:45 GMT (envelope-from mav@freebsd.org) Date: Sat, 14 Nov 2009 20:46:45 GMT Message-Id: <200911142046.nAEKkjSg091925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2009 20:46:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=170630 Change 170630 by mav@mav_mavbook on 2009/11/14 20:45:47 IFC Affected files ... .. //depot/projects/scottl-camlock/src/contrib/cvs/DEVEL-CVS#1 add .. //depot/projects/scottl-camlock/src/etc/etc.pc98/ttys#1 add .. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#44 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#129 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#80 integrate .. //depot/projects/scottl-camlock/src/sys/libkern/inet_aton.c#1 add .. //depot/projects/scottl-camlock/src/tools/build/options/WITHOUT_CVS#1 add .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-pidfile.c#1 add Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#44 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.85 2009/11/05 08:55:24 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.87 2009/11/14 20:30:42 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.10 2009/10/22 21:07:32 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.11 2009/11/14 20:30:42 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/cam_queue.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_queue.h,v 1.11 2009/10/22 21:07:32 mav Exp $ + * $FreeBSD: src/sys/cam/cam_queue.h,v 1.12 2009/11/14 20:30:42 mav Exp $ */ #ifndef _CAM_CAM_QUEUE_H ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#129 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.234 2009/11/11 11:10:36 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.235 2009/11/14 20:23:20 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#30 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.111 2009/10/23 08:27:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.112 2009/11/14 20:13:38 mav Exp $"); #include "opt_cd.h" ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_ch.c#21 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.49 2009/10/23 08:27:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.50 2009/11/14 20:13:38 mav Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#80 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.13 2009/11/11 11:10:36 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.14 2009/11/14 20:06:04 mav Exp $"); #include #include From owner-p4-projects@FreeBSD.ORG Sat Nov 14 23:33:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C00B51065698; Sat, 14 Nov 2009 23:33:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6BD831065694 for ; Sat, 14 Nov 2009 23:33:32 +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 58AAB8FC18 for ; Sat, 14 Nov 2009 23:33:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAENXWAO017369 for ; Sat, 14 Nov 2009 23:33:32 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAENXWrT017367 for perforce@freebsd.org; Sat, 14 Nov 2009 23:33:32 GMT (envelope-from rene@FreeBSD.org) Date: Sat, 14 Nov 2009 23:33:32 GMT Message-Id: <200911142333.nAENXWrT017367@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 Precedence: bulk Cc: Subject: PERFORCE change 170633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Nov 2009 23:33:33 -0000 http://p4web.freebsd.org/chv.cgi?CH=170633 Change 170633 by rene@rene_self on 2009/11/14 23:32:57 [porters handbook] Add a section about Clang to the "Dos and Don'ts" chapter. To be reviewed by the clang team and the doc review team. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#50 (text+ko) ==== @@ -13602,6 +13602,92 @@ shorthand solution. + + Clang: new C/C++ compiler + + A future version of &os; will likely have the Clang C/C++ + compiler as its base compiler. Some modifications to the Ports + Collection are necessary. In general, these are write proper + ports and write proper source code. More + specifically: + + + + Respect CC and CXX. Do + not any of cc, c99, + gcc, c++, or + g++ directly. + + + + Respect LD, do not use + ld directly. + + + + Do not use cpp for reformatting manual + pages or shell scripts. Try to use something more suitable + instead, possibly falling back to CPP. + + + + + If there are link errors related to missing or already + defined functions, try to add CSTD=gnu89 to + Makefile. The function vsnprintf() is + already built in. + + + + The -traditional option is not supported, + so existing occurences have to be removed. No concensus has yet + been reached on ports abusing this option to preserve white space + in text formatting. Note that the Clang preprocessor does not + preserve white space. + + + + Explicit type indication of variables must be used in + built-in assembler code. + + + + The main function must be properly declared as + + int main(int argc, char **argv) + + + + The maximum useable optimization level is 3. Level 4 is + reserved for link-time optimization for the Clang backend. + + + + + + Some temporary hacks that might be used if all else fails: + + + + Adding -fheinous-gnu-extensions. Note + that this option is already deprecated. + + + + Reducing the warning level by adding + --diasable-werror or + --disable-strict, or by disabling + --warn-common or + -Werror. + + + + + + Respect both <makevar>CC</makevar> and <makevar>CXX</makevar>