From owner-p4-projects@FreeBSD.ORG Sun Jul 6 01:42:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C36E41065682; Sun, 6 Jul 2008 01:42: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 85AE3106564A; Sun, 6 Jul 2008 01:42:31 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from watery.cc.kogakuin.ac.jp (watery.cc.kogakuin.ac.jp [133.80.152.80]) by mx1.freebsd.org (Postfix) with ESMTP id 1F4C18FC15; Sun, 6 Jul 2008 01:42:30 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) by watery.cc.kogakuin.ac.jp (unknown) with ESMTP id m661FePO072727; Sun, 6 Jul 2008 10:15:40 +0900 (JST) (envelope-from nyan@jp.FreeBSD.org) Date: Sun, 06 Jul 2008 10:15:12 +0900 (JST) Message-Id: <20080706.101512.193761302.nyan@jp.FreeBSD.org> To: marcel@freebsd.org From: Takahashi Yoshihiro In-Reply-To: <200807051805.m65I5T4Y056554@repoman.freebsd.org> References: <200807051805.m65I5T4Y056554@repoman.freebsd.org> X-Mailer: Mew version 6.1 on Emacs 22.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 144729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 01:42:32 -0000 In article <200807051805.m65I5T4Y056554@repoman.freebsd.org> Marcel Moolenaar writes: > @@ -67,9 +65,7 @@ > struct uart_class *class; > unsigned int i, j, ivar; > > - class = &uart_ns8250_class; /* currently ns8250 only */ > - if (class == NULL) > - return (ENXIO); > + class = &uart_i8251_class; > > /* Check the environment. */ > if (uart_getenv(devtype, di, class) == 0) Please revert this change. We want to use ns8250 class as default. And the above comment in the diff was wrong... The uart_i8251_class should be added to the uart_classes in uart_subr.c. --- TAKAHASHI Yoshihiro From owner-p4-projects@FreeBSD.ORG Sun Jul 6 02:10:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAF7D1065676; Sun, 6 Jul 2008 02:10: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 8C9EC1065671; Sun, 6 Jul 2008 02:10:15 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from watery.cc.kogakuin.ac.jp (watery.cc.kogakuin.ac.jp [133.80.152.80]) by mx1.freebsd.org (Postfix) with ESMTP id 252BF8FC0A; Sun, 6 Jul 2008 02:10:14 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) by watery.cc.kogakuin.ac.jp (unknown) with ESMTP id m662AE4t075191; Sun, 6 Jul 2008 11:10:14 +0900 (JST) (envelope-from nyan@jp.FreeBSD.org) Date: Sun, 06 Jul 2008 11:09:43 +0900 (JST) Message-Id: <20080706.110943.226722229.nyan@jp.FreeBSD.org> To: marcel@freebsd.org From: Takahashi Yoshihiro In-Reply-To: <200807051943.m65JhHZ6066371@repoman.freebsd.org> References: <200807051943.m65JhHZ6066371@repoman.freebsd.org> X-Mailer: Mew version 6.1 on Emacs 22.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: perforce@freebsd.org Subject: Re: PERFORCE change 144741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 02:10:16 -0000 In article <200807051943.m65JhHZ6066371@repoman.freebsd.org> Marcel Moolenaar writes: > static struct isa_pnp_id isa_i8251_ids[] = { > {0x0100e4a5, "RSA-98III"}, > {0} > }; > /* Probe PnP _and_ non-PnP i8251 here. */ > if (ISA_PNP_PROBE(parent, dev, isa_i8251_ids) != ENXIO) { > sc->sc_class = &uart_i8251_class; > return (uart_bus_probe(dev, 0, 0, 0, 0)); > } These are wrong. RSA98-III is based on ns8250 and has extended FIFO buffer. So I think that the uart_rsa_class should be added. FYI, RSA series are not for pc98 only. RSA-PCI (PCI) and RSA-DVII (ISA) exist but not supported yet. --- TAKAHASHI Yoshihiro From owner-p4-projects@FreeBSD.ORG Sun Jul 6 07:40:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FD3E1065679; Sun, 6 Jul 2008 07:40: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 649A11065677 for ; Sun, 6 Jul 2008 07:40:38 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33CAE8FC16 for ; Sun, 6 Jul 2008 07:40:38 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m667ecEw072025 for ; Sun, 6 Jul 2008 07:40:38 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m667eXuX072017 for perforce@freebsd.org; Sun, 6 Jul 2008 07:40:33 GMT (envelope-from julian@freebsd.org) Date: Sun, 6 Jul 2008 07:40:33 GMT Message-Id: <200807060740.m667eXuX072017@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144759 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 07:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=144759 Change 144759 by julian@julian_trafmon1 on 2008/07/06 07:40:24 Add a first draft of a vimage porting guide Affected files ... .. //depot/projects/vimage/porting_to_vimage.txt#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Jul 6 07:44:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCC291065676; Sun, 6 Jul 2008 07: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 8056C106564A for ; Sun, 6 Jul 2008 07:44:42 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 69BDA8FC0A for ; Sun, 6 Jul 2008 07:44:42 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m667igSN072429 for ; Sun, 6 Jul 2008 07:44:42 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m667igbh072427 for perforce@freebsd.org; Sun, 6 Jul 2008 07:44:42 GMT (envelope-from julian@freebsd.org) Date: Sun, 6 Jul 2008 07:44:42 GMT Message-Id: <200807060744.m667igbh072427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 07:44:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=144760 Change 144760 by julian@julian_trafmon1 on 2008/07/06 07:43:58 Add a note I forgot about Affected files ... .. //depot/projects/vimage/porting_to_vimage.txt#2 edit Differences ... ==== //depot/projects/vimage/porting_to_vimage.txt#2 (text+ko) ==== @@ -51,10 +51,14 @@ required for the module to stash away the virtual machine instance somewhere, and make associated changes in the code. +5/ Add the code described below to the files that make up the module + Details: +(temp. for module FOO add a definition for VNET_MOD_FOO in sys/vimage.h) + Symbols defined in other modules that have been virtualised will have been moved to a module-specific virtualisation structure. It will be defined in a .h file for just this purpose. If a module will never export virtualise From owner-p4-projects@FreeBSD.ORG Sun Jul 6 07:46:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9E0B1065686; Sun, 6 Jul 2008 07:46:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE34D106567D for ; Sun, 6 Jul 2008 07:46:44 +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 973488FC19 for ; Sun, 6 Jul 2008 07:46:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m667kixF072683 for ; Sun, 6 Jul 2008 07:46:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m667kivJ072681 for perforce@freebsd.org; Sun, 6 Jul 2008 07:46:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jul 2008 07:46:44 GMT Message-Id: <200807060746.m667kivJ072681@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 144761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 07:46:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=144761 Change 144761 by hselasky@hselasky_laptop001 on 2008/07/06 07:45:48 The beginning of a new generic USB file system interface, to better support the upcoming LibUSB 1.0. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#5 (text+ko) ==== @@ -102,6 +102,68 @@ uint8_t ude_addr; /* not used */ }; +struct usb2_fs_start { + uint8_t ep_index; +}; + +struct usb2_fs_stop { + uint8_t ep_index; +}; + +/* This structure is used for all endpoint types */ +struct usb2_fs_endpoint { + void *priv_sc0; /* private client data */ + void *priv_sc1; /* private client data */ + /* + * NOTE: isochronous USB transfer only use one buffer, but can have + * multiple frame lengths ! + */ + void **ppBuffer; /* pointer to userland buffers */ + uint32_t *pLength; /* pointer to frame lengths, updated + * to actual length */ + uint32_t nFrames; /* number of frames, updated to actual + * frames */ + uint16_t flags; + /* a single short frame will terminate */ +#define USB2_FS_FLAG_SINGLE_SHORT_OK 0x0001 + /* multiple short frames are allowed */ +#define USB2_FS_FLAG_MULTI_SHORT_OK 0x0002 + /* all frame(s) transmitted are short terminated */ +#define USB2_FS_FLAG_FORCE_SHORT 0x0004 + /* will do a clear-stall before xfer */ +#define USB2_FS_FLAG_CLEAR_STALL 0x0008 + uint16_t timeout; /* in milliseconds */ + /* timeout value for no timeout */ +#define USB2_FS_TIMEOUT_NONE 0 +}; + +struct usb2_fs_init { + /* userland pointer to endpoints structure */ + struct usb2_fs_endpoint *pEndpoints; + /* maximum number of endpoints */ + uint8_t ep_index_max; +}; + +struct usb2_fs_uninit { + uint8_t dummy; +}; + +struct usb2_fs_open { + uint32_t max_bufsize; + uint32_t max_frames; + uint8_t dev_index; /* currently unused */ + uint8_t ep_index; + uint8_t ep_no; /* bEndpointNumber */ +}; + +struct usb2_fs_close { + uint8_t ep_index; +}; + +struct usb2_fs_clear_stall_sync { + unit8_t ep_index; +}; + /* USB controller */ #define USB_REQUEST _IOWR('U', 1, struct usb2_ctl_request) #define USB_SETDEBUG _IOW ('U', 2, int) @@ -140,4 +202,13 @@ #define USB_GET_CM_OVER_DATA _IOR ('U', 130, int) #define USB_SET_CM_OVER_DATA _IOW ('U', 131, int) +/* USB file system interface */ +#define USB_FS_START _IOW ('U', 192, struct usb2_fs_start) +#define USB_FS_STOP _IOW ('U', 193, struct usb2_fs_stop) +#define USB_FS_INIT _IOW ('U', 194, struct usb2_fs_init) +#define USB_FS_UNINIT _IOW ('U', 195, struct usb2_fs_uninit) +#define USB_FS_OPEN _IOW ('U', 196, struct usb2_fs_open) +#define USB_FS_CLOSE _IOW ('U', 197, struct usb2_fs_close) +#define USB_FS_CLEAR_STALL_SYNC _IOW ('U', 198, struct usb2_fs_clear_stall_sync) + #endif /* _USB2_IOCTL_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Jul 6 08:50:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 849691065674; Sun, 6 Jul 2008 08:50:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A6BE1065670 for ; Sun, 6 Jul 2008 08:50:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 33AE08FC15 for ; Sun, 6 Jul 2008 08:50:49 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m668onqp089750 for ; Sun, 6 Jul 2008 08:50:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m668onpR089748 for perforce@freebsd.org; Sun, 6 Jul 2008 08:50:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 6 Jul 2008 08:50:49 GMT Message-Id: <200807060850.m668onpR089748@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 144764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 08:50:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=144764 Change 144764 by hselasky@hselasky_laptop001 on 2008/07/06 08:49:50 Compile fix and add USB status on transfer completion. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#6 (text+ko) ==== @@ -135,6 +135,7 @@ uint16_t timeout; /* in milliseconds */ /* timeout value for no timeout */ #define USB2_FS_TIMEOUT_NONE 0 + uint8_t status; /* see USB_ERR_XXX */ }; struct usb2_fs_init { @@ -161,7 +162,7 @@ }; struct usb2_fs_clear_stall_sync { - unit8_t ep_index; + uint8_t ep_index; }; /* USB controller */ From owner-p4-projects@FreeBSD.ORG Sun Jul 6 08:57:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C0C41065683; Sun, 6 Jul 2008 08:57: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 021161065681 for ; Sun, 6 Jul 2008 08:57:57 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF8808FC12 for ; Sun, 6 Jul 2008 08:57:56 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m668vukA090287 for ; Sun, 6 Jul 2008 08:57:56 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m668vue2090285 for perforce@freebsd.org; Sun, 6 Jul 2008 08:57:56 GMT (envelope-from trasz@freebsd.org) Date: Sun, 6 Jul 2008 08:57:56 GMT Message-Id: <200807060857.m668vue2090285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 08:57:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=144766 Change 144766 by trasz@trasz_traszkan on 2008/07/06 08:57:32 With NFS4 ACLs, it is possible that applying a mode to an ACL which is identical to the mode computed from that ACL will modify the ACL. For example, mode computed from the following ACL is 0600: user:kamila:rwx--------C--:------:allow owner@:--x-----------:------:deny owner@:rw-p---A-W-Co-:------:allow group@:rwxp----------:------:deny group@:--------------:------:allow everyone@:rwxp---A-W-Co-:------:deny everyone@:------a-R-c--s:------:allow However, applying that mode (chmod 0600) changes the ACL into this: user:kamila:rwx-----------:------:deny user:kamila:rwx--------C--:------:allow owner@:--x-----------:------:deny owner@:rw-p---A-W-Co-:------:allow group@:rwxp----------:------:deny group@:--------------:------:allow everyone@:rwxp---A-W-Co-:------:deny everyone@:------a-R-c--s:------:allow In chmod(1) utility, there is an optimisation, which makes it not call chmod(2) if the mode of the file is the same as the new mode. Disable that optimisation for files which may have NFS4 ACLs. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#5 (text+ko) ==== @@ -6,10 +6,6 @@ - Add error checking to acl_to_text_nfs4.c. -- Find out what to do with chmod(1). Right now, "chmod 600" on file - which already has mode 0600 does not call chmod(2) at all - and it - should, as it might cause ACL recomputation. - - Make access control more granular. - Attach ZFS to the framework. ==== //depot/projects/soc2008/trasz_nfs4acl/bin/chmod/chmod.c#2 (text+ko) ==== @@ -54,6 +54,7 @@ #include void usage(void); +int may_have_nfs4acl(const FTSENT *ent); int main(int argc, char *argv[]) @@ -180,8 +181,15 @@ break; } newmode = getmode(set, p->fts_statp->st_mode); - if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS)) - continue; + /* + * With NFS4 ACLs, it is possible that applying a mode + * identical to the one computed from an ACL will change + * that ACL. + */ + if (may_have_nfs4acl(p) == 0) { + if ((newmode & ALLPERMS) == (p->fts_statp->st_mode & ALLPERMS)) + continue; + } if ((*change_mode)(p->fts_accpath, newmode) && !fflag) { warn("%s", p->fts_path); rval = 1; @@ -219,3 +227,25 @@ "usage: chmod [-fhv] [-R [-H | -L | -P]] mode file ...\n"); exit(1); } + +int +may_have_nfs4acl(const FTSENT *ent) +{ + int ret; + static dev_t previous_dev = (dev_t)-1; + static int supports_acls = -1; + + if (previous_dev != ent->fts_statp->st_dev) { + previous_dev = ent->fts_statp->st_dev; + supports_acls = 0; + + ret = pathconf(ent->fts_accpath, _PC_EXTENDED_SECURITY_NP); + if (ret > 0) + supports_acls = 1; + else if (ret < 0 && errno != EINVAL) + warn("%s", ent->fts_path); + } + + return (supports_acls); +} + From owner-p4-projects@FreeBSD.ORG Sun Jul 6 09:28:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39B12106566C; Sun, 6 Jul 2008 09:28: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 EC21F1065673 for ; Sun, 6 Jul 2008 09:28:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D57F78FC0A for ; Sun, 6 Jul 2008 09:28:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m669SRJW093826 for ; Sun, 6 Jul 2008 09:28:27 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m669SR5X093824 for perforce@freebsd.org; Sun, 6 Jul 2008 09:28:27 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 09:28:27 GMT Message-Id: <200807060928.m669SR5X093824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144767 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 09:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=144767 Change 144767 by gabor@gabor_server on 2008/07/06 09:28:26 - Add --exclude for -r Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#54 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#30 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#47 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#54 (text+ko) ==== @@ -80,10 +80,17 @@ int eflags = REG_STARTEND; int matchall; /* shortcut */ + +/* Searching patterns */ int patterns, pattern_sz; char **pattern; regex_t *r_pattern; +/* Filename exclusion patterns */ +int epatterns, epattern_sz; +char **epattern; +regex_t *er_pattern; + /* For regex errors */ char re_error[RE_ERROR_BUF + 1]; @@ -112,6 +119,7 @@ int xflag; /* -x: pattern must match entire line */ int lbflag; /* --line-buffered */ int nullflag; /* --null */ +int exclflag; /* --exclude */ char *label; /* --label */ char *color; /* --color */ unsigned long long mcount; /* count for -m */ @@ -128,7 +136,8 @@ MMAP_OPT, LINEBUF_OPT, LABEL_OPT, - NULL_OPT + NULL_OPT, + R_EXCLUDE_OPT }; /* Housekeeping */ @@ -162,6 +171,7 @@ {"null", no_argument, NULL, NULL_OPT}, {"color", optional_argument, NULL, COLOR_OPT}, {"colour", optional_argument, NULL, COLOR_OPT}, + {"exclude", required_argument, NULL, R_EXCLUDE_OPT}, {"after-context", required_argument, NULL, 'A'}, {"text", no_argument, NULL, 'a'}, {"before-context", required_argument, NULL, 'B'}, @@ -239,6 +249,22 @@ } static void +add_epattern(char *pat, size_t len) +{ + if (epatterns == epattern_sz) { + epattern_sz *= 2; + epattern = grep_realloc(epattern, ++epattern_sz * sizeof(*epattern)); + } + if (len > 0 && pat[len - 1] == '\n') + --len; + /* pat may not be NUL-terminated */ + epattern[epatterns] = grep_malloc(len + 1); + memcpy(epattern[epatterns], pat, len); + epattern[epatterns][len] = '\0'; + ++epatterns; +} + +static void read_patterns(const char *fn) { FILE *f; @@ -481,6 +507,12 @@ case NULL_OPT: nullflag = 1; break; + case R_EXCLUDE_OPT: + if (dirbehave != DIR_RECURSE) + usage(); + exclflag = 1; + add_epattern(optarg, strlen(optarg)); + break; case HELP_OPT: default: usage(); @@ -516,6 +548,15 @@ errx(2, "%s", re_error); } } + er_pattern = grep_calloc(epatterns, sizeof(*er_pattern)); + for (i = 0; i < epatterns; ++i) { + c = regcomp(&er_pattern[i], epattern[i], REG_EXTENDED); + if (c != 0) { + regerror(c, &er_pattern[i], re_error, + RE_ERROR_BUF); + errx(2, "%s", re_error); + } + } if (lbflag) setlinebuf(stdout); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#30 (text+ko) ==== @@ -82,14 +82,14 @@ /* Command line flags */ extern int Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Zflag, bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, - qflag, sflag, vflag, wflag, xflag, nullflag; + qflag, sflag, vflag, wflag, xflag, nullflag, exclflag; extern unsigned long long Aflag, Bflag, mcount; extern char *color, *label; extern int binbehave, devbehave, dirbehave, linkbehave; -extern int first, prev, matchall, patterns, tail, notfound; -extern char **pattern; -extern regex_t *r_pattern; +extern int first, prev, matchall, patterns, epatterns, tail, notfound; +extern char **pattern, **epattern; +extern regex_t *r_pattern, *er_pattern; /* For regex errors */ #define RE_ERROR_BUF 512 ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#47 (text+ko) ==== @@ -62,7 +62,7 @@ { FTS *fts; FTSENT *p; - int c, fts_flags; + int i, c, ok, fts_flags; c = fts_flags = 0; @@ -92,7 +92,21 @@ p->fts_path); break; default: - c += procfile(p->fts_path); + if (exclflag) { + regmatch_t pmatch; + + ok = 1; + pmatch.rm_so = 0; + pmatch.rm_eo = strlen(p->fts_path); + for (i = 0; i < patterns; i++) + if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { + ok = 0; + break; + } + } else + ok = 1; + if (ok) + c += procfile(p->fts_path); break; } } From owner-p4-projects@FreeBSD.ORG Sun Jul 6 09:34:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67B5F1065670; Sun, 6 Jul 2008 09:34: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 1267E1065688 for ; Sun, 6 Jul 2008 09:34:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DECD18FC0C for ; Sun, 6 Jul 2008 09:34:33 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m669YXmw094324 for ; Sun, 6 Jul 2008 09:34:33 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m669YXvU094322 for perforce@freebsd.org; Sun, 6 Jul 2008 09:34:33 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 09:34:33 GMT Message-Id: <200807060934.m669YXvU094322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144768 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 09:34:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=144768 Change 144768 by gabor@gabor_server on 2008/07/06 09:34:21 - Revert previous change, this was not really what is desired Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#55 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#31 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#48 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#55 (text+ko) ==== @@ -80,17 +80,10 @@ int eflags = REG_STARTEND; int matchall; /* shortcut */ - -/* Searching patterns */ int patterns, pattern_sz; char **pattern; regex_t *r_pattern; -/* Filename exclusion patterns */ -int epatterns, epattern_sz; -char **epattern; -regex_t *er_pattern; - /* For regex errors */ char re_error[RE_ERROR_BUF + 1]; @@ -119,7 +112,6 @@ int xflag; /* -x: pattern must match entire line */ int lbflag; /* --line-buffered */ int nullflag; /* --null */ -int exclflag; /* --exclude */ char *label; /* --label */ char *color; /* --color */ unsigned long long mcount; /* count for -m */ @@ -136,8 +128,7 @@ MMAP_OPT, LINEBUF_OPT, LABEL_OPT, - NULL_OPT, - R_EXCLUDE_OPT + NULL_OPT }; /* Housekeeping */ @@ -171,7 +162,6 @@ {"null", no_argument, NULL, NULL_OPT}, {"color", optional_argument, NULL, COLOR_OPT}, {"colour", optional_argument, NULL, COLOR_OPT}, - {"exclude", required_argument, NULL, R_EXCLUDE_OPT}, {"after-context", required_argument, NULL, 'A'}, {"text", no_argument, NULL, 'a'}, {"before-context", required_argument, NULL, 'B'}, @@ -249,22 +239,6 @@ } static void -add_epattern(char *pat, size_t len) -{ - if (epatterns == epattern_sz) { - epattern_sz *= 2; - epattern = grep_realloc(epattern, ++epattern_sz * sizeof(*epattern)); - } - if (len > 0 && pat[len - 1] == '\n') - --len; - /* pat may not be NUL-terminated */ - epattern[epatterns] = grep_malloc(len + 1); - memcpy(epattern[epatterns], pat, len); - epattern[epatterns][len] = '\0'; - ++epatterns; -} - -static void read_patterns(const char *fn) { FILE *f; @@ -507,12 +481,6 @@ case NULL_OPT: nullflag = 1; break; - case R_EXCLUDE_OPT: - if (dirbehave != DIR_RECURSE) - usage(); - exclflag = 1; - add_epattern(optarg, strlen(optarg)); - break; case HELP_OPT: default: usage(); @@ -548,15 +516,6 @@ errx(2, "%s", re_error); } } - er_pattern = grep_calloc(epatterns, sizeof(*er_pattern)); - for (i = 0; i < epatterns; ++i) { - c = regcomp(&er_pattern[i], epattern[i], REG_EXTENDED); - if (c != 0) { - regerror(c, &er_pattern[i], re_error, - RE_ERROR_BUF); - errx(2, "%s", re_error); - } - } if (lbflag) setlinebuf(stdout); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#31 (text+ko) ==== @@ -82,14 +82,14 @@ /* Command line flags */ extern int Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Zflag, bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, - qflag, sflag, vflag, wflag, xflag, nullflag, exclflag; + qflag, sflag, vflag, wflag, xflag, nullflag; extern unsigned long long Aflag, Bflag, mcount; extern char *color, *label; extern int binbehave, devbehave, dirbehave, linkbehave; -extern int first, prev, matchall, patterns, epatterns, tail, notfound; -extern char **pattern, **epattern; -extern regex_t *r_pattern, *er_pattern; +extern int first, prev, matchall, patterns, tail, notfound; +extern char **pattern; +extern regex_t *r_pattern; /* For regex errors */ #define RE_ERROR_BUF 512 ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#48 (text+ko) ==== @@ -62,7 +62,7 @@ { FTS *fts; FTSENT *p; - int i, c, ok, fts_flags; + int c, fts_flags; c = fts_flags = 0; @@ -92,21 +92,7 @@ p->fts_path); break; default: - if (exclflag) { - regmatch_t pmatch; - - ok = 1; - pmatch.rm_so = 0; - pmatch.rm_eo = strlen(p->fts_path); - for (i = 0; i < patterns; i++) - if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { - ok = 0; - break; - } - } else - ok = 1; - if (ok) - c += procfile(p->fts_path); + c += procfile(p->fts_path); break; } } From owner-p4-projects@FreeBSD.ORG Sun Jul 6 10:00:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F9461065677; Sun, 6 Jul 2008 10:00:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6ED31065673 for ; Sun, 6 Jul 2008 09:59:59 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFFF88FC13 for ; Sun, 6 Jul 2008 09:59:59 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m669xxf1096249 for ; Sun, 6 Jul 2008 09:59:59 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m669xxRp096247 for perforce@freebsd.org; Sun, 6 Jul 2008 09:59:59 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 09:59:59 GMT Message-Id: <200807060959.m669xxRp096247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144769 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 10:00:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=144769 Change 144769 by gabor@gabor_server on 2008/07/06 09:59:55 - Add --unidirectional-new-file Affected files ... .. //depot/projects/soc2008/gabor_textproc/diff/diff.1#3 edit .. //depot/projects/soc2008/gabor_textproc/diff/diff.c#10 edit .. //depot/projects/soc2008/gabor_textproc/diff/diff.h#5 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/diff/diff.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" -.Dd Jul 4, 2008 +.Dd Jul 6, 2008 .Dt DIFF 1 .Os .Sh NAME @@ -281,6 +281,8 @@ The .Ar file argument can be a directory. +.It Fl Fl unidirectional-new-file +Treat the first file as empty and generate a diff accordingly. .It Fl w , Fl Fl ignore-all-space Is similar to .Fl b ==== //depot/projects/soc2008/gabor_textproc/diff/diff.c#10 (text+ko) ==== @@ -45,7 +45,7 @@ #include "diff.h" int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag; -int sflag, tflag, Tflag, wflag; +int sflag, tflag, Tflag, wflag, uniflag; int format, status; int fcase_behave = FCASE_SENSITIVE; unsigned long long context; @@ -60,7 +60,8 @@ FCASE_SENSITIVE_OPT, FCASE_IGNORE_OPT, FROMFILE_OPT, - TOFILE_OPT + TOFILE_OPT, + UNIDIR_OPT }; #define OPTIONS "0123456789abC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:" @@ -76,8 +77,8 @@ { "GTYPE-group-format", required_argument, NULL, OPT_GTYPE }, { "line-format", required_argument, NULL, OPT_LF }, { "LTYPE-line-format", required_argument, NULL, OPT_LLF }, - { "tabsize", optional_argument, NULL, OPT_TSIZE }, - { "unidirectional-new-file", no_argument, NULL, OPT_UNINF }, */ + { "tabsize", optional_argument, NULL, OPT_TSIZE }, */ + { "unidirectional-new-file", no_argument, NULL, UNIDIR_OPT }, { "from-file", required_argument, NULL, FROMFILE_OPT }, { "to-file", required_argument, NULL, TOFILE_OPT }, /* XXX: UNIMPLEMENTED @@ -133,7 +134,7 @@ main(int argc, char **argv) { char *ep, *fromfile = NULL, *tofile = NULL, **oargv; - int ch, lastch, gotstdin, prevoptind, newarg; + int ch, lastch, gotstdin, prevoptind, newarg, flags = 0; char *dst, *src; oargv = argv; @@ -261,6 +262,9 @@ err(2, "--from-file and --to-file are both specified"); asprintf(&fromfile, "%s", optarg); break; + case UNIDIR_OPT: + uniflag = 1; + break; case TOFILE_OPT: if (fromfile != NULL) err(2, "--from-file and --to-file are both specified"); @@ -326,8 +330,12 @@ if (strcmp(src, "-") == 0) { fstat(STDIN_FILENO, &stb1); gotstdin = 1; - } else if (stat(src, &stb1) != 0) - err(2, "%s", src); + } else if (stat(src, &stb1) != 0) { + if (uniflag) + flags |= D_EMPTY1; + else + err(2, "%s", src); + } if (strcmp(dst, "-") == 0) { fstat(STDIN_FILENO, &stb2); gotstdin = 1; @@ -352,7 +360,7 @@ if (stat(argv[1], &stb2) < 0) err(2, "%s", argv[1]); } - print_status(diffreg(src, dst, 0), src, dst, + print_status(diffreg(src, dst, flags), src, dst, NULL); if (fromfile != NULL) dst = argv[ch]; ==== //depot/projects/soc2008/gabor_textproc/diff/diff.h#5 (text+ko) ==== @@ -83,7 +83,7 @@ }; extern int aflag, bflag, dflag, iflag, lflag, Nflag, Pflag, pflag, rflag, - sflag, tflag, Tflag, wflag; + sflag, tflag, Tflag, wflag, uniflag; extern int format, status; extern int fcase_behave; extern unsigned long long context; From owner-p4-projects@FreeBSD.ORG Sun Jul 6 10:30:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C12221065688; Sun, 6 Jul 2008 10:30:30 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8508C1065672 for ; Sun, 6 Jul 2008 10:30:30 +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 6CE338FC1C for ; Sun, 6 Jul 2008 10:30:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66AUUNB099812 for ; Sun, 6 Jul 2008 10:30:30 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66AUUQs099810 for perforce@freebsd.org; Sun, 6 Jul 2008 10:30:30 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 6 Jul 2008 10:30:30 GMT Message-Id: <200807061030.m66AUUQs099810@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144771 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 10:30:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=144771 Change 144771 by pgj@disznohal on 2008/07/06 10:29:36 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#7 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/nwhitehorn.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#5 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#5 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#6 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/halfaq.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/index.xsl#3 integrate .. //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#4 edit .. //depot/projects/docproj_hu/www/share/sgml/news.xml#8 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#4 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#7 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.452 2008/06/23 11:42:41 erik Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.453 2008/07/03 14:50:22 nwhitehorn Exp $ --> aaron@FreeBSD.org"> @@ -780,6 +780,8 @@ nsouch@FreeBSD.org"> +nwhitehorn@FreeBSD.org"> + nyan@FreeBSD.org"> obraun@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1338,3 +1338,9 @@ &a.ivoras; &pgpkey.ivoras; + + + &a.nwhitehorn; + &pgpkey.nwhitehorn; + + ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#5 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -202,6 +202,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#6 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.197 2008/06/23 11:42:41 erik Exp $ +$FreeBSD: www/en/developers.sgml,v 1.198 2008/07/03 16:43:49 nwhitehorn Exp $ --> @@ -391,6 +391,7 @@ + ==== //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -158,8 +158,11 @@

  • What is the current state of development GNOME on FreeBSD?

    -

    GNOME 2.22.0 is now out, and ports and packages are - up-to-date. Keep those bug reports coming.

    +

    GNOME 2.23.4 is the latest development release, and it is + relatively stable. The only obvious known issue is that + some icons are missing. This is part of an initiative to + clean up the deprecated icons. As the &gnomedevelver; + releases continue, this will gradually be fixed.

    • &footer; ==== //depot/projects/docproj_hu/www/en/gnome/docs/halfaq.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -210,7 +210,7 @@ for PolicyKit.conf, see the PolicyKit.conf(5) man page.

    -

    Step 4: If you have fixed volumes you wish to mount, +

    Step 3: If you have fixed volumes you wish to mount, you must also authorize yourself for the org.freedesktop.hal.storage.mount-fixed action. Note: This step is applicable to ALL users @@ -227,7 +227,7 @@ </match> -

    Step 5: While not really part of hal volume +

    Step 4: While not really part of hal volume management, you may also be able to have volumes listed in /etc/fstab automatically mounted. In GNOME, for example, Nautilus will mount volumes listed in ==== //depot/projects/docproj_hu/www/en/gnome/index.xsl#3 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + State of the port

    GNOME for FreeBSD is currently supported on - 5-STABLE, 6-STABLE, 6.3, 7.X, 8-CURRENT, and 6.2. + 6.3, 6-STABLE, 7.0, 7-STABLE, and 8-CURRENT. Most of GNOME has been ported to FreeBSD, but there is still plenty left to be done!

    ==== //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ - + ]> @@ -19,72 +19,80 @@ -

    Az igazi világban...

    +

    A valós világban...

    -

    FreeBSD a Sajtóban

    +

    &os; a sajtóban

    -

    Cikkek a FreeBSD-rõl a Sajtóban.

    +

    Cikkek a &os;-rõl a sajtóban.

    Hírcsoportok

    -

    A következõ hírcsoportok a FreeBSD-hez kapcsolódó +

    A következõ hírcsoportok a &os;-vel kapcsolatos megbeszéléseket tartalmaznak:

    További források

    -

    Year 2000 Kompatibilitás

    +

    Kétezredik év kompatibilitás

    -

    A FreeBSD Projekt jelenlegi álláspontja a 2000. évi - kompatibilitásról.

    +

    A &os; Projekt jelenlegi álláspontja a + kétezredik évi kompatibilitásról.

    -

    A Forráskód

    +

    A forráskód

    -

    Ha szeret a forráskódban túrkálni, - itt talál egy hypertext verziót a FreeBSD kernel +

    Ha szeretnénk a forráskódban + túrkálni, akkor itt találunk egy hypertext + verziót a &os; rendszermag forráskódjáról, Robert Watson - önkéntes munkájának köszönhetõen.

    + önkéntes munkájának + köszönhetõen.

    Daemon News

    -

    Az ipari vezetõ a BSD hírekben.

    +

    A BSD hírek legjobb forrása.

    -

    Ahogyan a FreeBSD önmaga is, ez a dokumentáció is - önkéntes erõfeszítés eredménye. - A célok is le vannak itt írva, illetve a - javítások és az új anyag - elküldésének módja is.

    +

    Ahogyan a &os; önmaga is, ez a dokumentáció is + önkéntes erõfeszítés + eredménye. Itt megtalálhatjuk a célokat, + valamint a javítások és az új anyagok + beküldésének módjait is.

    -

    A FreeBSD - Diary

    +

    A &os; Diary

    -

    A FreeBSD Diary egy kezdõknek szóló - "hogyan" dokumentumgyûjtemény. A cél egy - raká,s lépésrõl-lépésre - haladó útmutató írása +

    A &os; Diary egy kezdõknek szóló ,,hogyan'' + dokumentumgyûjtemény. Itt a cél + lépésrõl-lépésre haladó + útmutatók írása a különbözõ portok telepítésérõl és konfigurációjáról.

    @@ -92,32 +100,35 @@

    The O'Reilly Network BSD Dev Center

    -

    A BSD Dev Center két állandó oszlopot tart - a FreeBSD-rõl, tippeket és útmutatókat.

    +

    A BSD Dev Centernek két állandó &os; rovata + van, ahol különbözõ tippeket és + útmutatókat olvashatunk.

    BSDnexus

    -

    A BSDnexus aktív fórumokat nyújt a FreeBSD-rõl - és a többi BSD-rõl.

    +

    A BSDnexus a &os;-vel és a többi BSD-vel kapcsolatban + kínál aktív internetes fórumokat.

    BSD Guides

    -

    A BSDGuides.org rengeteg BSD-vel kapcsolatos útmutatót - kínál.

    +

    A BSDGuides.org rengeteg BSD-vel kapcsolatos + útmutatót tartalmaz.

    Egyéb dokumentáció

    -

    4.4BSD Dokumentumok: Ez a 4.4BSD - dokumentumok hypertext verziója, amit a - /usr/share/doc könyvtár - alatt talál egy FreeBSD telepítésen (ha telepítette a - doc disztribúciót).

    +

    4.4BSD dokumentumok: + Ez a 4.4BSD dokumentumok hypertext verziója, amelyet a /usr/share/doc + könyvtárban találhatunk meg minden &os; + rendszeren (amennyiben telepítettük a doc + terjesztést).

    -

    Info Dokumentumok: Ezek az Info - dokumentumok hypertext verziói, amelyeket a - /usr/share/info könyvtár - alatt talál meg egy FreeBSD telepítésen (ha telepítette - az info disztribúciót).

    +

    Info dokumentumok: Ezek + az Info dokumentumok hypertext verziói, amelyeket a /usr/share/info + könyvtár alatt találhatunk meg minden &os; + rendszeren (ha telepítettük az info + terjesztést).

    &footer; ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#8 (text+ko) ==== @@ -20,7 +20,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.170 2008/06/23 11:42:41 erik Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.172 2008/07/03 16:43:48 nwhitehorn Exp $ @@ -28,6 +28,18 @@ 2008 + 7 + + + 3 + +

    New committer: Nathan + Whitehorn (src)

    +     +     +     + + 6 @@ -36,6 +48,14 @@

    New committer: Erik Cederstrand (projects)

    + + + FreeBSD Technologies in Firefox 3 +

    A + press + release describing FreeBSD technologies used by Mozilla + Firefox.

    +     ==== //depot/projects/docproj_hu/www/share/sgml/press.xml#4 (text+ko) ==== @@ -9,7 +9,7 @@ - $FreeBSD: www/share/sgml/press.xml,v 1.62 2008/06/24 15:47:55 brd Exp $ + $FreeBSD: www/share/sgml/press.xml,v 1.65 2008/07/05 15:59:21 jkoshy Exp $ @@ -17,15 +17,29 @@ 2008 + 7 + + Book Review: The Best of FreeBSD Basics + http://www.osnews.com/story/19947/Book_Review:_The_Best_of_FreeBSD_Basics + OS News + http://www.osnews.com/ + 2 July 2008 + Peter Hummers +

    A review of the book ``The Best of FreeBSD Basics''.

    +     +     + + 6 - FreeBSD Technologies in Firefox 3 - http://www.prweb.com/releases/2008/6/prweb1042664.htm - PR Web - http://www.prweb.com/ - 23 June 2008 -

    An article about how Mozilla Firefox uses FreeBSD - Technologies.

    + How FreeBSD makes vulnerability auditing easy: portaudit + http://blogs.techrepublic.com.com/security/?p=477 + Tech Republic + http://www.techrepublic.com.com/ + 24 June 2008 + Chad Perrin +

    An article that highlights the ease with which a FreeBSD + system can be kept upto-date with respect to vulnerabilities.

     From owner-p4-projects@FreeBSD.ORG Sun Jul 6 12:35:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33EB31065688; Sun, 6 Jul 2008 12:35: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 EBB50106567F for ; Sun, 6 Jul 2008 12:35:36 +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 BBF988FC12 for ; Sun, 6 Jul 2008 12:35:36 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66CZaOD012923 for ; Sun, 6 Jul 2008 12:35:36 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66CZaK1012921 for perforce@freebsd.org; Sun, 6 Jul 2008 12:35:36 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 6 Jul 2008 12:35:36 GMT Message-Id: <200807061235.m66CZaK1012921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 144775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 12:35:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=144775 Change 144775 by pgj@disznohal on 2008/07/06 12:35:27 A forced submit to remark that a work-in-progress Hungarian source rework got into integrated changes in my last submit Pointhat for: pgj Affected files ... .. //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#5 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/docs/webresources.sgml#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Jul 6 12:50:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A8531065670; Sun, 6 Jul 2008 12:50: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 E105B1065680 for ; Sun, 6 Jul 2008 12:50:52 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB25E8FC17 for ; Sun, 6 Jul 2008 12:50:52 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66CoqW3023410 for ; Sun, 6 Jul 2008 12:50:52 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66CoqQe023408 for perforce@freebsd.org; Sun, 6 Jul 2008 12:50:52 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 12:50:52 GMT Message-Id: <200807061250.m66CoqQe023408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 12:50:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=144777 Change 144777 by gabor@gabor_server on 2008/07/06 12:50:06 - Readd --exclude and add --include in the same way. Even if these are not GNU compatible as GNU seems to except a shell pattern, I consider this a great feature with extended regexps. Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#56 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#32 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#49 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#56 (text+ko) ==== @@ -70,9 +70,10 @@ /*10*/ "FreeBSD grep 2.5.1\n", /*11*/ "unknown --binary-files option", /*12*/ "Binary file %s matches\n", -/*12*/ "value out of range", -/*13*/ "unknown -d or --directory option", -/*14*/ "unknown --color option" +/*13*/ "value out of range", +/*14*/ "unknown -d or --directory option", +/*15*/ "unknown --color option", +/*16*/ "both --include and --exclude are specified" }; /* Flags passed to regcomp() and regexec() */ @@ -80,10 +81,17 @@ int eflags = REG_STARTEND; int matchall; /* shortcut */ + +/* Searching patterns */ int patterns, pattern_sz; char **pattern; regex_t *r_pattern; +/* Filename exclusion patterns */ +int epatterns, epattern_sz; +char **epattern; +regex_t *er_pattern; + /* For regex errors */ char re_error[RE_ERROR_BUF + 1]; @@ -112,6 +120,8 @@ int xflag; /* -x: pattern must match entire line */ int lbflag; /* --line-buffered */ int nullflag; /* --null */ +int exclflag; /* --exclude */ +int inclflag; /* --include */ char *label; /* --label */ char *color; /* --color */ unsigned long long mcount; /* count for -m */ @@ -128,7 +138,9 @@ MMAP_OPT, LINEBUF_OPT, LABEL_OPT, - NULL_OPT + NULL_OPT, + R_EXCLUDE_OPT, + R_INCLUDE_OPT }; /* Housekeeping */ @@ -162,6 +174,8 @@ {"null", no_argument, NULL, NULL_OPT}, {"color", optional_argument, NULL, COLOR_OPT}, {"colour", optional_argument, NULL, COLOR_OPT}, + {"exclude", required_argument, NULL, R_EXCLUDE_OPT}, + {"include", required_argument, NULL, R_INCLUDE_OPT}, {"after-context", required_argument, NULL, 'A'}, {"text", no_argument, NULL, 'a'}, {"before-context", required_argument, NULL, 'B'}, @@ -239,6 +253,22 @@ } static void +add_epattern(char *pat, size_t len) +{ + if (epatterns == epattern_sz) { + epattern_sz *= 2; + epattern = grep_realloc(epattern, ++epattern_sz * sizeof(*epattern)); + } + if (len > 0 && pat[len - 1] == '\n') + --len; + /* pat may not be NUL-terminated */ + epattern[epatterns] = grep_malloc(len + 1); + memcpy(epattern[epatterns], pat, len); + epattern[epatterns][len] = '\0'; + ++epatterns; +} + +static void read_patterns(const char *fn) { FILE *f; @@ -470,7 +500,7 @@ } else if (strcmp("never", optarg) == 0) color = NULL; else - errx(2, getstr(14)); + errx(2, getstr(15)); break; case LABEL_OPT: label = optarg; @@ -481,6 +511,20 @@ case NULL_OPT: nullflag = 1; break; + case R_INCLUDE_OPT: + if (dirbehave != DIR_RECURSE) + usage(); + inclflag = 1; + exclflag = 0; + add_epattern(optarg, strlen(optarg)); + break; + case R_EXCLUDE_OPT: + if (dirbehave != DIR_RECURSE) + usage(); + inclflag = 0; + exclflag = 1; + add_epattern(optarg, strlen(optarg)); + break; case HELP_OPT: default: usage(); @@ -516,6 +560,15 @@ errx(2, "%s", re_error); } } + er_pattern = grep_calloc(epatterns, sizeof(*er_pattern)); + for (i = 0; i < epatterns; ++i) { + c = regcomp(&er_pattern[i], epattern[i], REG_EXTENDED); + if (c != 0) { + regerror(c, &er_pattern[i], re_error, + RE_ERROR_BUF); + errx(2, "%s", re_error); + } + } if (lbflag) setlinebuf(stdout); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#32 (text+ko) ==== @@ -82,14 +82,15 @@ /* Command line flags */ extern int Eflag, Fflag, Gflag, Hflag, Jflag, Lflag, Zflag, bflag, cflag, hflag, iflag, lflag, mflag, nflag, oflag, - qflag, sflag, vflag, wflag, xflag, nullflag; + qflag, sflag, vflag, wflag, xflag; +extern int nullflag, exclflag, inclflag; extern unsigned long long Aflag, Bflag, mcount; extern char *color, *label; extern int binbehave, devbehave, dirbehave, linkbehave; -extern int first, prev, matchall, patterns, tail, notfound; -extern char **pattern; -extern regex_t *r_pattern; +extern int first, prev, matchall, patterns, epatterns, tail, notfound; +extern char **pattern, **epattern; +extern regex_t *r_pattern, *er_pattern; /* For regex errors */ #define RE_ERROR_BUF 512 ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#49 (text+ko) ==== @@ -62,7 +62,7 @@ { FTS *fts; FTSENT *p; - int c, fts_flags; + int i, c, ok, fts_flags; c = fts_flags = 0; @@ -92,7 +92,31 @@ p->fts_path); break; default: - c += procfile(p->fts_path); + if (exclflag) { + regmatch_t pmatch; + + ok = 1; + pmatch.rm_so = 0; + pmatch.rm_eo = strlen(p->fts_path); + for (i = 0; i < epatterns; i++) + if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { + ok = 0; + break; + } + } else if (inclflag) { + regmatch_t pmatch; + ok = 0; + pmatch.rm_so = 0; + pmatch.rm_eo = strlen(p->fts_path); + for (i = 0; i < epatterns; i++) + if (regexec(&er_pattern[i], p->fts_path, 0, &pmatch, eflags) == 0) { + ok = 1; + break; + } + } else + ok = 1; + if (ok) + c += procfile(p->fts_path); break; } } From owner-p4-projects@FreeBSD.ORG Sun Jul 6 13:31:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81DFF1065674; Sun, 6 Jul 2008 13:31: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 45DF01065672 for ; Sun, 6 Jul 2008 13:31:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30ED58FC20 for ; Sun, 6 Jul 2008 13:31:34 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66DVY21028008 for ; Sun, 6 Jul 2008 13:31:34 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66DVYbN028006 for perforce@freebsd.org; Sun, 6 Jul 2008 13:31:34 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 13:31:34 GMT Message-Id: <200807061331.m66DVYbN028006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144780 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 13:31:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=144780 Change 144780 by gabor@gabor_server on 2008/07/06 13:31:22 - Little change on -V to be more informative and more consistent with GNU grep Requested by: Pedro F. Giffuni Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#57 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#33 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#57 (text+ko) ==== @@ -67,7 +67,7 @@ /* 7*/ "\t[--null] [pattern] [file ...]\n", /* 8*/ "parentheses not balanced", /* 9*/ "context out of range", -/*10*/ "FreeBSD grep 2.5.1\n", +/*10*/ "%s (BSD grep) %s\n", /*11*/ "unknown --binary-files option", /*12*/ "Binary file %s matches\n", /*13*/ "value out of range", @@ -465,7 +465,7 @@ /* noop, compatibility */ break; case 'V': - printf(getstr(10)); + printf(getstr(10), __progname, VERSION); exit(0); case 'v': vflag = 1; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#33 (text+ko) ==== @@ -44,6 +44,7 @@ extern char *errstr[]; +#define VERSION "2.5.1-FreeBSD" #define BINFILE_BIN 0 #define BINFILE_SKIP 1 From owner-p4-projects@FreeBSD.ORG Sun Jul 6 13:37:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C16DC1065677; Sun, 6 Jul 2008 13:37:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83E2E1065674 for ; Sun, 6 Jul 2008 13:37:40 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6EE5D8FC12 for ; Sun, 6 Jul 2008 13:37:40 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66DbeqK028515 for ; Sun, 6 Jul 2008 13:37:40 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66Dbeve028513 for perforce@freebsd.org; Sun, 6 Jul 2008 13:37:40 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 13:37:40 GMT Message-Id: <200807061337.m66Dbeve028513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144781 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 13:37:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=144781 Change 144781 by gabor@gabor_server on 2008/07/06 13:36:59 - Resync catalogues Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#58 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#4 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#3 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#4 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#58 (text+ko) ==== @@ -73,7 +73,6 @@ /*13*/ "value out of range", /*14*/ "unknown -d or --directory option", /*15*/ "unknown --color option", -/*16*/ "both --include and --exclude are specified" }; /* Flags passed to regcomp() and regexec() */ ==== //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#4 (text+ko) ==== @@ -11,9 +11,9 @@ 7 "\t[--null] [pattern] [file ...]\n" 8 "parentheses not balanced" 9 "context out of range" -10 "FreeBSD grep 2.5.1\n" +10 "%s (BSD grep) %s\n" 11 "unknown --binary-files option" 12 "Binary file %s matches\n" -12 "value out of range" -13 "unknown -d or --directory option" -14 "unknown --color option" +13 "value out of range" +14 "unknown -d or --directory option" +15 "unknown --color option" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#3 (text+ko) ==== @@ -11,9 +11,9 @@ 7 "\t[--null] [minta] [fájl ...]\n" 8 "párosítatlan zárójelek" 9 "a kontextus a megengedett tartományon kívül esik" -10 "FreeBSD grep 2.5.1\n" +10 "%s (BSD grep) %s\n" 11 "ismeretlen --binary-files opció" 12 "%s bináris fájl illeszkedik\n" -12 "az érték a megengedett tartományon kívül esik" -13 "ismeretlen -d vagy --directory opció" -14 "ismeretlen --color opció" +13 "az érték a megengedett tartományon kívül esik" +14 "ismeretlen -d vagy --directory opció" +15 "ismeretlen --color opció" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#4 (text+ko) ==== @@ -11,9 +11,9 @@ 7 "\t[--null] [padrão] [arquivo ...]\n" 8 "parênteses nâo balanceados" 9 "contexto está fora da escala" -10 "FreeBSD grep 2.5.1\n" +10 "%s (BSD grep) %s\n" 11 "opcão não conhecida de --binary-files" 12 "arquivo binário %s casa com o padrão\n" -12 "el valor está fora da escala" -13 "opcão não conhecida de -d ou --directory" -14 "opcão não conhecida de --color" +13 "el valor está fora da escala" +14 "opcão não conhecida de -d ou --directory" +15 "opcão não conhecida de --color" From owner-p4-projects@FreeBSD.ORG Sun Jul 6 13:50:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 286961065685; Sun, 6 Jul 2008 13:50: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 E03EB1065682 for ; Sun, 6 Jul 2008 13:50:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CB9CA8FC14 for ; Sun, 6 Jul 2008 13:50:53 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66Dorrb029558 for ; Sun, 6 Jul 2008 13:50:53 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66Dor8R029556 for perforce@freebsd.org; Sun, 6 Jul 2008 13:50:53 GMT (envelope-from gabor@freebsd.org) Date: Sun, 6 Jul 2008 13:50:53 GMT Message-Id: <200807061350.m66Dor8R029556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 144782 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 13:50:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=144782 Change 144782 by gabor@gabor_server on 2008/07/06 13:50:22 - Add --speed-large-files. At the moment this is a compatibility noop, optimization comes later. Affected files ... .. //depot/projects/soc2008/gabor_textproc/diff/diff.c#11 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/diff/diff.c#11 (text+ko) ==== @@ -61,7 +61,8 @@ FCASE_IGNORE_OPT, FROMFILE_OPT, TOFILE_OPT, - UNIDIR_OPT + UNIDIR_OPT, + SPEEDLF_OPT }; #define OPTIONS "0123456789abC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:" @@ -82,8 +83,8 @@ { "from-file", required_argument, NULL, FROMFILE_OPT }, { "to-file", required_argument, NULL, TOFILE_OPT }, /* XXX: UNIMPLEMENTED - { "horizon-lines", required_argument, NULL, OPT_HLINES }, - { "speed-large-files", no_argument, NULL, OPT_LFILES }, */ + { "horizon-lines", required_argument, NULL, OPT_HLINES }, */ + { "speed-large-files", no_argument, NULL, SPEEDLF_OPT }, { "help", no_argument, NULL, HELP_OPT }, { "text", no_argument, NULL, 'a' }, /* XXX: UNIMPLEMENTED @@ -276,6 +277,9 @@ case FCASE_IGNORE_OPT: fcase_behave = FCASE_IGNORE; break; + case SPEEDLF_OPT: + /* noop, compatibility */ + break; case NORMAL_OPT: /* compatibility, this is the default */ break; From owner-p4-projects@FreeBSD.ORG Sun Jul 6 15:41:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14F0F1065673; Sun, 6 Jul 2008 15:41:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD96C1065671 for ; Sun, 6 Jul 2008 15:41:45 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FBD18FC0C for ; Sun, 6 Jul 2008 15:41:45 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66Ffjra040631 for ; Sun, 6 Jul 2008 15:41:45 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66FfjDd040629 for perforce@freebsd.org; Sun, 6 Jul 2008 15:41:45 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 15:41:45 GMT Message-Id: <200807061541.m66FfjDd040629@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 144784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 15:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=144784 Change 144784 by marcel@marcel_xcllnt on 2008/07/06 15:41:24 Make ns8250 the default. In other words, assume that people refer to the ns8250 by default. Requested by: nyan Affected files ... .. //depot/projects/uart/dev/uart/uart_cpu_pc98.c#20 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_cpu_pc98.c#20 (text+ko) ==== @@ -77,7 +77,7 @@ struct uart_class *class; unsigned int i, ivar; - class = &uart_i8251_class; + class = &uart_ns8250_class; /* Check the environment. */ if (uart_getenv(devtype, di, class) == 0) From owner-p4-projects@FreeBSD.ORG Sun Jul 6 15:52:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B7181065689; Sun, 6 Jul 2008 15:52: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 D55FE1065684 for ; Sun, 6 Jul 2008 15:52:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C19C08FC1F for ; Sun, 6 Jul 2008 15:52:56 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66FqumH041496 for ; Sun, 6 Jul 2008 15:52:56 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66Fqugh041494 for perforce@freebsd.org; Sun, 6 Jul 2008 15:52:56 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 15:52:56 GMT Message-Id: <200807061552.m66Fqugh041494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 144785 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 15:52:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=144785 Change 144785 by marcel@marcel_xcllnt on 2008/07/06 15:52:13 The RSA-98III is actually a ns8250 class UART. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus_isa.c#12 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus_isa.c#12 (text+ko) ==== @@ -65,6 +65,7 @@ {0x0205d041, "Multiport serial device (non-intelligent 16550)"}, /* PNP0502 */ {0x1005d041, "Generic IRDA-compatible device"}, /* PNP0510 */ {0x1105d041, "Generic IRDA-compatible device"}, /* PNP0511 */ + {0x0100e4a5, "RSA-98III"}, /* Devices that do not have a compatid */ {0x12206804, NULL}, /* ACH2012 - 5634BTS 56K Video Ready Modem */ {0x7602a904, NULL}, /* AEI0276 - 56K v.90 Fax Modem (LKT) */ @@ -159,11 +160,6 @@ {0} }; -static struct isa_pnp_id isa_i8251_ids[] = { - {0x0100e4a5, "RSA-98III"}, - {0} -}; - static int uart_isa_probe(device_t dev) { @@ -179,11 +175,7 @@ return (uart_bus_probe(dev, 0, 0, 0, 0)); } - /* Probe PnP _and_ non-PnP i8251 here. */ - if (ISA_PNP_PROBE(parent, dev, isa_i8251_ids) != ENXIO) { - sc->sc_class = &uart_i8251_class; - return (uart_bus_probe(dev, 0, 0, 0, 0)); - } + /* Add checks for non-ns8250 IDs here. */ #ifdef PC98 sc->sc_class = uart_pc98_getdev(bus_get_resource_start(dev, From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:06:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B9C71065673; Sun, 6 Jul 2008 16:06: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 0DEAE106566C for ; Sun, 6 Jul 2008 16:06:47 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.68]) by mx1.freebsd.org (Postfix) with ESMTP id E82C28FC17 for ; Sun, 6 Jul 2008 16:06:46 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from asmtp022-bge351000.mac.com (asmtp022-bge351000 [10.150.69.85]) by smtpoutm.mac.com (Xserve/smtpout005/MantshX 4.0) with ESMTP id m66FoMhf018028; Sun, 6 Jul 2008 08:50:22 -0700 (PDT) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=US-ASCII; format=flowed Received: from [192.168.1.102] (209-128-86-226.bayarea.net [209.128.86.226]) by asmtp022.mac.com (Sun Java(tm) System Messaging Server 6.3-6.03 (built Mar 14 2008; 32bit)) with ESMTPSA id <0K3L00EOKDBX4620@asmtp022.mac.com>; Sun, 06 Jul 2008 08:50:22 -0700 (PDT) Sender: xcllnt@mac.com Message-id: From: Marcel Moolenaar To: Takahashi Yoshihiro In-reply-to: <20080706.110943.226722229.nyan@jp.FreeBSD.org> Date: Sun, 06 Jul 2008 08:50:21 -0700 References: <200807051943.m65JhHZ6066371@repoman.freebsd.org> <20080706.110943.226722229.nyan@jp.FreeBSD.org> X-Mailer: Apple Mail (2.926) Cc: marcel@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 144741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 16:06:47 -0000 On Jul 5, 2008, at 7:09 PM, Takahashi Yoshihiro wrote: > In article <200807051943.m65JhHZ6066371@repoman.freebsd.org> > Marcel Moolenaar writes: > >> static struct isa_pnp_id isa_i8251_ids[] = { >> {0x0100e4a5, "RSA-98III"}, >> {0} >> }; > >> /* Probe PnP _and_ non-PnP i8251 here. */ >> if (ISA_PNP_PROBE(parent, dev, isa_i8251_ids) != ENXIO) { >> sc->sc_class = &uart_i8251_class; >> return (uart_bus_probe(dev, 0, 0, 0, 0)); >> } > > These are wrong. RSA98-III is based on ns8250 and has extended FIFO > buffer. So I think that the uart_rsa_class should be added. Oh. In your patch you define it as i8251. I only refactored the code. Also, the ns8250 class already supports extended FIFOs, so we don't need a separate class for that. I'll change it... > FYI, RSA series are not for pc98 only. > RSA-PCI (PCI) and RSA-DVII (ISA) exist but not supported yet. Ok, good to know. With the refactored code there's maximum sharing, so UART will support them on other platforms as well... -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:31:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5735C1065674; Sun, 6 Jul 2008 16:31: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 1B47F1065684 for ; Sun, 6 Jul 2008 16:31:36 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 07B518FC12 for ; Sun, 6 Jul 2008 16:31:36 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66GVZdD046007 for ; Sun, 6 Jul 2008 16:31:35 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66GVZw8046005 for perforce@freebsd.org; Sun, 6 Jul 2008 16:31:35 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 16:31:35 GMT Message-Id: <200807061631.m66GVZw8046005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 144787 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 16:31:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=144787 Change 144787 by marcel@marcel_xcllnt on 2008/07/06 16:31:06 Add a skeletal implementation for the i8251. Doesn't do anything yet. Affected files ... .. //depot/projects/uart/conf/files#90 edit .. //depot/projects/uart/dev/uart/uart_dev_i8251.c#6 add .. //depot/projects/uart/modules/uart/Makefile#17 edit Differences ... ==== //depot/projects/uart/conf/files#90 (text+ko) ==== @@ -1260,6 +1260,8 @@ dev/uart/uart_bus_scc.c optional uart scc dev/uart/uart_core.c optional uart dev/uart/uart_dbg.c optional uart gdb +dev/uart/uart_dev_i8251.c optional uart uart_i8251 +dev/uart/uart_dev_i8251.c optional uart scc dev/uart/uart_dev_ns8250.c optional uart uart_ns8250 dev/uart/uart_dev_quicc.c optional uart quicc dev/uart/uart_dev_sab82532.c optional uart uart_sab82532 ==== //depot/projects/uart/modules/uart/Makefile#17 (text+ko) ==== @@ -11,7 +11,7 @@ SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ uart_core.c uart_dbg.c \ - uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \ + uart_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \ uart_if.c uart_if.h uart_subr.c uart_tty.c .if ${MACHINE} == "sun4v" SRCS+= uart_cpu_sparc64.c From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:33:38 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FB01106569A; Sun, 6 Jul 2008 16:33: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 62E6C1065672 for ; Sun, 6 Jul 2008 16:33:38 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3525E8FC18 for ; Sun, 6 Jul 2008 16:33:38 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66GXcTE046182 for ; Sun, 6 Jul 2008 16:33:38 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66GXc3X046180 for perforce@freebsd.org; Sun, 6 Jul 2008 16:33:38 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 16:33:38 GMT Message-Id: <200807061633.m66GXc3X046180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 144788 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 16:33:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=144788 Change 144788 by marcel@marcel_xcllnt on 2008/07/06 16:32:37 Use uart(4), not sio(4). Affected files ... .. //depot/projects/uart/pc98/conf/GENERIC#27 edit Differences ... ==== //depot/projects/uart/pc98/conf/GENERIC#27 (text+ko) ==== @@ -151,9 +151,7 @@ device cardbus # CardBus (32-bit) bus # Serial (COM) ports -options COM_MULTIPORT -#options COM_ESP # ESP98 -device sio # 8250, 16[45]50, 8251 based serial ports +device uart # 8250, 16[45]50, 8251 based serial ports device mse #device joy From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:39:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E740C1065676; Sun, 6 Jul 2008 16:39:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB57C106564A for ; Sun, 6 Jul 2008 16:39:44 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 97E4A8FC12 for ; Sun, 6 Jul 2008 16:39:44 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66Gdi5m046730 for ; Sun, 6 Jul 2008 16:39:44 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66Gdig0046728 for perforce@freebsd.org; Sun, 6 Jul 2008 16:39:44 GMT (envelope-from marcel@freebsd.org) Date: Sun, 6 Jul 2008 16:39:44 GMT Message-Id: <200807061639.m66Gdig0046728@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 144790 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 16:39:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=144790 Change 144790 by marcel@marcel_xcllnt on 2008/07/06 16:39:19 Compile... Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_i8251.c#7 edit .. //depot/projects/uart/modules/uart/Makefile#18 edit .. //depot/projects/uart/pc98/conf/DEFAULTS#8 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_i8251.c#7 (text+ko) ==== @@ -217,7 +217,6 @@ { struct uart_bas *bas; struct uart_devinfo *di; - uint16_t st, rb; bas = &sc->sc_bas; if (sc->sc_sysdev != NULL) { @@ -303,7 +302,6 @@ { struct uart_bas *bas; int ipend; - uint16_t scce; bas = &sc->sc_bas; ipend = 0; ==== //depot/projects/uart/modules/uart/Makefile#18 (text+ko) ==== @@ -11,7 +11,8 @@ SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ uart_core.c uart_dbg.c \ - uart_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \ + uart_dev_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c \ + uart_dev_z8530.c \ uart_if.c uart_if.h uart_subr.c uart_tty.c .if ${MACHINE} == "sun4v" SRCS+= uart_cpu_sparc64.c ==== //depot/projects/uart/pc98/conf/DEFAULTS#8 (text+ko) ==== @@ -18,8 +18,8 @@ device io # I/O device # UART chips on this platform +device uart_i8251 device uart_ns8250 -#device uart_i8251 # Default partitioning schemes options GEOM_BSD From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:46:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C6671065675; Sun, 6 Jul 2008 16:46: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 40EC6106567E for ; Sun, 6 Jul 2008 16:46:52 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2D9FB8FC14 for ; Sun, 6 Jul 2008 16:46:52 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66GkqDD047390 for ; Sun, 6 Jul 2008 16:46:52 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66GkqSV047388 for perforce@freebsd.org; Sun, 6 Jul 2008 16:46:52 GMT (envelope-from rpaulo@FreeBSD.org) Date: Sun, 6 Jul 2008 16:46:52 GMT Message-Id: <200807061646.m66GkqSV047388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 144793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 16:46:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=144793 Change 144793 by rpaulo@rpaulo_epsilon on 2008/07/06 16:45:54 Add a couple more variables and correct the order. Affected files ... .. //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#10 edit Differences ... ==== //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#9 $ + * $P4: //depot/projects/soc2008/rpaulo-tcpad/tcpad.h#10 $ */ #ifndef _TCPAD_H_ @@ -45,13 +45,17 @@ /* TCP internal variables, from tcpcb */ int t_state; /* TCP FSM state */ tcp_seq snd_una; - tcp_seq snd_max; tcp_seq snd_nxt; + tcp_seq snd_wnd; tcp_seq snd_up; + tcp_seq snd_wl1; + tcp_seq snd_wl2; tcp_seq iss; + + tcp_seq rcv_nxt; + tcp_seq rcv_wnd; + tcp_seq rcv_up; tcp_seq irs; - tcp_seq snd_wnd; - tcp_seq rcv_wnd; int isv6; struct dumppkth *pktshead; From owner-p4-projects@FreeBSD.ORG Sun Jul 6 16:47:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A63D41065679; Sun, 6 Jul 2008 16:47: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 6A3961065673 for ; Sun, 6 Jul 2008 16:47:53 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 562BF8FC1F for ; Sun, 6 Jul 2008 16:47:53 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66GlrpP056735 for ; Sun, 6 Jul 2008 16:47:53 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66GlrM5056733 for perforce@freebsd.org; Sun, 6 Jul 2008 16:47:53 GMT (envelope-from julian@freebsd.org) Date: Sun, 6 Jul 2008 16:47:53 GMT Message-Id: <200807061647.m66GlrM5056733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 144794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 16:47:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=144794 Change 144794 by julian@julian_trafmon1 on 2008/07/06 16:46:59 A bit more stuff added.. e.g symmap stuff. saving before taking kids on picnic. Affected files ... .. //depot/projects/vimage/porting_to_vimage.txt#3 edit Differences ... ==== //depot/projects/vimage/porting_to_vimage.txt#3 (text+ko) ==== @@ -112,7 +112,38 @@ could rely on the current thread being a good reference for the correct virtual machine. -As an example of virtualising a dummy module named the FOO module +When a new module is defined for virtualisation. The following +structure defining macro is used to define it to the framework. + + +#define VNET_MOD_DECLARE(m_name_uc, m_name_lc, m_iattach, m_idetach, \ + m_dependson, m_symmap) \ + static const struct vnet_modinfo vnet_##m_name_lc##_modinfo = { \ + .vmi_id = VNET_MOD_##m_name_uc, \ + .vmi_dependson = VNET_MOD_##m_dependson, \ + .vmi_name = #m_name_lc, \ + .vmi_iattach = m_iattach, \ + .vmi_idetach = m_idetach, \ + .vmi_struct_size = \ + sizeof(struct vnet_##m_name_lc), \ + .vmi_symmap = m_symmap \ +The ID we allocated in the temporary first step in "Details" is +the first entry here. Eventually this should be automatically done +by module name. The DEPENDSON field tells us the order that modules +should be initialised in a new virtual machine. This may later need +to be changes to a list of text module names for dynamic calculation. +The rest of the fields are self explanatory.. +With the exception of the symmap entry. +The symmap allows us to intercept calls by libkvm to the +linker when it is looking up symbols and to redirect it +dynamically. this allows for example "netstat -r" to find the +routing tables for THIS virtual machine. (cute eh?) +(of course that won't work for core dumps). (XXX *needs thought *) + + + + +As example of virtualising a dummy module named the FOO module the following code might be added to a special vfoo.h or at least to the exisitng foo.h file: @@ -129,7 +160,7 @@ #define VNET_FOO(sym) VSYM(vnet_foo, sym) -#ifdef VIMAGE +#if (defined(VIMAGE) || defined(FUTURE)) struct vnet_foo { int _foo_counter struct foo_bar _foo_barx; @@ -158,16 +189,59 @@ #include [...] +#ifndef VIMAGE + /* initially the globals would have been here, + * and for now we will leave them here when not using VIMAGE. + * In the future we will instead have a static version of the structure. + */ +# if defined(FUTURE) + struct vnet_foo vnet_foo_globals; +# else /* !FUTURE */ + int foo_counter = 0; + struct foo_bar foo_barx = {}; +# endif /* !FUTURE */ +#endif /* !VIMAGE */ + +[...] + +#if (defined(VIMAGE) || defined(FUTURE)) static vnet_attach_fn vnet_foo_iattach; -#ifdef VIMAGE static vnet_detach_fn vnet_foo_idetach; -#endif /* VIMAGE */ +#endif +#ifdef VIMAGE +/* If we have symbols we need to divert for libkvm + * then put them in here. We may net need to do anything if + * the symbols are not used by libkvm. + */ +static struct vnet_symmap vnet_net_symmap[] = { + VNET_SYMMAP(foo, foo_counter), + VNET_SYMMAP(foo, foo_barx), + VNET_SYMMAP_END +}; +/* + * Declare our module and state that we want to be done after the + * loopback interface is initialised for the virtual machine. + */ VNET_MOD_DECLARE(FOO, foo, vnet_foo_iattach, - vnet_foo_idetach, LOIF, NULL) + vnet_foo_idetach, LOIF, vnet_foo_symmap) +#endif /* VIMAGE */ [...] +/* a pre-exisiting 'foo' function that will be converted. */ +void +foo_work(void) +{ + INIT_VNET_FOO(curvnet); /* Add this at the front */ + + V_foo_counter++; /* add "V_" to teh front */ + [...] + V_foo_barx.mumble = V_foo_counter; /* and here too */ + [...] +} + +#if (defined(VIMAGE) || defined(FUTURE)) static int vnet_foo_iattach(const void *unused) { INIT_VNET_FOO(curvnet); @@ -176,6 +250,7 @@ bzero (&V_foo_barx, sizeof (V_foo_barx)); return 0; } +#endif #ifdef VIMAGE static int vnet_foo_idetach(const void *unused) @@ -204,9 +279,13 @@ #ifdef VIMAGE /* This will do the work for each vortual machine. */ vnet_mod_register(&vnet_foo_modinfo); -#else +#else /* !VIMAGE */ +#ifdef FUTURE /* otherwise do the initialisation directly */ vnet_foo_iattach(NULL); +#else /* !FUTURE */ +/* otherwise the intialisation is done statically */ +#endif /* !FUTURE */ #endif /* !VIMAGE */ break; case MOD_UNLOAD: From owner-p4-projects@FreeBSD.ORG Sun Jul 6 21:16:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 469001065673; Sun, 6 Jul 2008 21:16:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A4761065670 for ; Sun, 6 Jul 2008 21:16:24 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E96C58FC19 for ; Sun, 6 Jul 2008 21:16:23 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m66LGNL4094895 for ; Sun, 6 Jul 2008 21:16:23 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m66LGNde094893 for perforce@freebsd.org; Sun, 6 Jul 2008 21:16:23 GMT (envelope-from snb@FreeBSD.org) Date: Sun, 6 Jul 2008 21:16:23 GMT Message-Id: <200807062116.m66LGNde094893@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 144800 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2008 21:16:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=144800 Change 144800 by snb@snb_toro on 2008/07/06 21:16:04 Upon receipt of vm_lowmem() signals, try deleting all dirhashes older than DH_RECLAIMAGE, set here to five seconds for now. If all the dirhashes are newer than this, just fall back to trying to delete the one at the beginning of ufsdirhash_list. DH_RECLAIMAGE probably will need tweaking, and so far dh_lastused is only being updated during calls to ufsdirhash_build(), ufsdirhash_lookup(), and ufsdirhash_add(). It may need to be updated when other functions are called as well. Also, I have not yet tested this code. This is a check point before I lose my network connection. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#2 edit .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#5 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/dirhash.h#2 (text+ko) ==== @@ -68,6 +68,12 @@ #define DH_SCOREINIT 8 /* initial dh_score when dirhash built */ #define DH_SCOREMAX 64 /* max dh_score value */ +/* + * If a vm_lowmem signal is received, we will try to free memory by + * deleting all hashes older than DH_RECLAIMAGE seconds. + */ +#define DH_RECLAIMAGE 5 + /* * The main hash table has 2 levels. It is an array of pointers to * blocks of DH_NBLKOFF offsets. @@ -101,6 +107,8 @@ int dh_onlist; /* true if on the ufsdirhash_list chain */ + time_t dh_lastused; /* time the dirhash was last read or written*/ + /* Protected by ufsdirhash_mtx. */ TAILQ_ENTRY(dirhash) dh_list; /* chain of all dirhashes */ }; ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#5 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -92,7 +93,8 @@ static int ufsdirhash_findslot(struct dirhash *dh, char *name, int namelen, doff_t offset); static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset); -static int ufsdirhash_destroy(void); +static int ufsdirhash_destroy(struct dirhash *dh); +static int ufsdirhash_destroy_first(void); static int ufsdirhash_recycle(int wanted); static void ufsdirhash_lowmem(void); static void ufsdirhash_free_locked(struct inode *ip); @@ -330,6 +332,7 @@ dh->dh_seqopt = 0; dh->dh_seqoff = 0; dh->dh_score = DH_SCOREINIT; + dh->dh_lastused = time_second; /* * Use non-blocking mallocs so that we will revert to a linear @@ -500,6 +503,9 @@ /* Update the score. */ if (dh->dh_score < DH_SCOREMAX) dh->dh_score++; + + /* Update last used time. */ + dh->dh_lastused = time_second; DIRHASHLIST_UNLOCK(); vp = ip->i_vnode; @@ -742,6 +748,9 @@ dh->dh_hused++; DH_ENTRY(dh, slot) = offset; + /* Update last used time. */ + dh->dh_lastused = time_second; + /* Update the per-block summary info. */ ufsdirhash_adjfree(dh, offset, -DIRSIZ(0, dirp)); ufsdirhash_release(dh); @@ -1081,34 +1090,17 @@ } /* - * Delete the first dirhash on the list and reclaim its memory. - * Assumes that ufsdirhash_list is locked, and leaves it locked. - * If unable to obtain a lock on the first dirhash, moves down - * the list until it can lock a dirhash and destroys it. Returns - * the amount of memory freed, or -1 if unable to find any - * dirhashes that can be destroyed. + * Delete the given dirhash and reclaim its memory. Assumes that + * ufsdirhash_list is locked, and leaves it locked. Also assumes + * that dh is locked. Returns the amount of memory freed. */ static int -ufsdirhash_destroy() +ufsdirhash_destroy(struct dirhash *dh) { - struct dirhash *dh; doff_t **hash; u_int8_t *blkfree; int i, mem, narrays; - dh = TAILQ_FIRST(&ufsdirhash_list); - if (dh == NULL) - return (-1); - - /* - * If we can't lock it it's in use and we don't want to - * destroy it anyway. Go on to the next in the list. - */ - while (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { - dh = TAILQ_NEXT(dh, dh_list); - if (dh == NULL) - return (-1); - } KASSERT(dh->dh_hash != NULL, ("dirhash: NULL hash on list")); /* Remove it from the list and detach its memory. */ @@ -1132,7 +1124,7 @@ /* Account for the returned memory. */ DIRHASHLIST_LOCK(); - ufs_dirhashmem -= mem; + ufs_dirhashmem -= mem; return (mem); } @@ -1155,9 +1147,16 @@ return (-1); } - /* Try deleting a dirhash. Give up if we can't delete any. */ - if (ufsdirhash_destroy() < 0) - return (-1); + /* + * If we can't lock it it's in use and we don't want to + * recycle it anyway. + */ + if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { + dh = TAILQ_NEXT(dh, dh_list); + continue; + } + + ufsdirhash_destroy(dh); /* Repeat if necessary. */ dh = TAILQ_FIRST(&ufsdirhash_list); @@ -1172,15 +1171,35 @@ static void ufsdirhash_lowmem() { + struct dirhash *dh; + int memfreed = 0; + ufs_dirhashlowmemcount++; DIRHASHLIST_LOCK(); - if (ufs_dirhashmem > 0) - /* - * Try deleting only one dirhash for now, and don't bother - * to check if it worked. - */ - ufsdirhash_destroy(); + /* + * Delete all dirhashes not used for more than DH_RECLAIMAGE seconds. + * If we can't get a lock on the dirhash, it will be skipped. + */ + for (dh = TAILQ_FIRST(&ufsdirhash_list); dh != NULL; dh = + TAILQ_NEXT(dh, dh_list)) { + if (time_second - dh->dh_lastused > DH_RECLAIMAGE && + lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) + memfreed += ufsdirhash_destroy(dh); + } + + /* + * If no hashes were old enough, instead try deleting a single dirhash + * from the end of the list. + */ + dh = TAILQ_FIRST(&ufsdirhash_list); + while (memfreed == 0 && dh != NULL) { + if (lockmgr(&dh->dh_lock, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { + dh = TAILQ_NEXT(dh, dh_list); + continue; + } + memfreed += ufsdirhash_destroy(dh); + } DIRHASHLIST_UNLOCK(); } From owner-p4-projects@FreeBSD.ORG Mon Jul 7 02:20:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93CD61065671; Mon, 7 Jul 2008 02:20: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 3FD37106564A for ; Mon, 7 Jul 2008 02:20:31 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2AE0B8FC12 for ; Mon, 7 Jul 2008 02:20:31 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m672KV7K036452 for ; Mon, 7 Jul 2008 02:20:31 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m672KVjW036450 for perforce@freebsd.org; Mon, 7 Jul 2008 02:20:31 GMT (envelope-from alepulver@freebsd.org) Date: Mon, 7 Jul 2008 02:20:31 GMT Message-Id: <200807070220.m672KVjW036450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver To: Perforce Change Reviews Cc: Subject: PERFORCE change 144806 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 02:20:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=144806 Change 144806 by alepulver@alepulver_deimos on 2008/07/07 02:20:06 Initial working version plus test port. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/README#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.fpc.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gecko.mk#1 branch .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.licenses.mk#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#2 integrate .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/Makefile#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/distinfo#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/pkg-descr#1 add .. //depot/projects/soc2008/alepulver-portslicense/ports/Mk/test-license-1/pkg-plist#1 add Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gcc.mk#2 (text+ko) ==== @@ -31,7 +31,7 @@ # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. # -# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.16 2008/05/05 23:26:30 gerald Exp $ +# $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.17 2008/06/28 16:52:40 gerald Exp $ # GCC_Include_MAINTAINER= gerald@FreeBSD.org @@ -99,7 +99,9 @@ MAKE_ENV+= F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}" .endif + .if defined(USE_GCC) + # See if we can use a later version _USE_GCC:= ${USE_GCC:S/+//} .if ${USE_GCC} != ${_USE_GCC} @@ -190,21 +192,25 @@ .endfor .undef V - .if defined(_GCC_BUILD_DEPENDS) BUILD_DEPENDS+= ${_GCC_PORT_DEPENDS}:${PORTSDIR}/lang/${_GCC_BUILD_DEPENDS} .endif MAKE_ENV+= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" +.endif +# defined(USE_GCC) + + test-gcc: @echo USE_GCC=${USE_GCC} + @echo USE_FORTRAN=${USE_FORTRAN} +.if defined(USE_GCC) .if defined(_GCC_ORLATER) @echo Port can use later versions. .else @echo Port cannot use later versions. .endif - @echo USE_FORTRAN=${USE_FORTRAN} .for v in ${GCCVERSIONS} @echo -n "GCC version: ${_GCCVERSION_${v}_V} " .if defined(_GCC_FOUND${v}) @@ -214,7 +220,7 @@ # @echo ${v} - ${_GCC_FOUND${v}} - ${_GCCVERSION_${v}_L} to ${_GCCVERSION_${v}_R} - ${_GCCVERSION_${v}_V} .endfor @echo Using GCC version ${_USE_GCC} +.endif @echo CC=${CC} - CXX=${CXX} - CFLAGS=${CFLAGS} @echo F77=${F77} - FC=${FC} - FFLAGS=${FFLAGS} @echo BUILD_DEPENDS=${BUILD_DEPENDS} -.endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnome.mk#2 (text+ko) ==== @@ -1,9 +1,9 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.147 2008/05/29 16:34:11 mezz Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.148 2008/06/30 20:16:17 mezz Exp $ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.447 2008/03/12 03:42:31 marcus Exp $ +# $MCom: ports-stable/Mk/bsd.gnome.mk,v 1.8 2008/06/16 21:35:56 mezz Exp $ # # Please view me with 4 column tabs! @@ -645,7 +645,7 @@ # Also, check to see if each component has a desktop requirement. If it does, # and if the user's chosen desktop is not of the same version, mark the # port as IGNORE. -. for component in ${USE_GNOME} +. for component in ${USE_GNOME:C/^([^:]+).*/\1/} . if defined(GNOME_DESKTOP_VERSION) && \ defined(${component}_GNOME_DESKTOP_VERSION) . if ${GNOME_DESKTOP_VERSION}!=${${component}_GNOME_DESKTOP_VERSION} @@ -677,16 +677,21 @@ ${PATCH_WRKSRC}/$$file; \ done; .else -. if ${USE_GNOME:Mltverhack}!="" || ${USE_GNOME:Mltasneededhack}!="" +. if ${USE_GNOME:Mltverhack*}!="" || ${USE_GNOME:Mltasneededhack}!="" IGNORE= cannot install: ${PORTNAME} uses the ltverhack and/or ltasneededhack GNOME components but does not use libtool . endif .endif +.if ${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}=="" +ltverhack_LIB_VERSION= major=.`expr $$current - $$age` +.else +ltverhack_LIB_VERSION= major=".${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}" +.endif ltverhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS} ltverhack_PRE_PATCH= for file in gnome-ltmain.sh gnome-libtool; do \ if [ -f ${WRKDIR}/$$file ]; then \ ${REINPLACE_CMD} -e \ - '/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \ + '/freebsd-elf)/,/;;/ s|major="\.$$current"|${ltverhack_LIB_VERSION}|; \ /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \ ${WRKDIR}/$$file; \ fi; \ @@ -703,9 +708,9 @@ # Then traverse through all components, check which of them # exist in ${_USE_GNOME} and set variables accordingly .ifdef _USE_GNOME -. if ${USE_GNOME:Mltverhack}!= "" || ${USE_GNOME:Mltasneededhack}!= "" +. if ${USE_GNOME:Mltverhack*}!= "" || ${USE_GNOME:Mltasneededhack}!= "" GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH} -.endif +. endif . for component in ${_USE_GNOME_ALL} . if ${_USE_GNOME:M${component}}!="" PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS} ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.gnustep.mk#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.49 2008/05/04 21:13:21 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.50 2008/06/20 15:13:50 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -266,7 +266,7 @@ # .if defined(USE_GNUSTEP_BACK) .if defined(WITH_GNUSTEP_DEVEL) -BACKSUFFIX?= -013 +BACKSUFFIX?= -014 .else BACKSUFFIX?= -012 .endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.port.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.593 2008/05/27 22:12:02 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.595 2008/06/30 20:16:17 mezz Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -423,6 +423,9 @@ # USE_EFL - If set, this port use EFL libraries. # Implies inclusion of bsd.efl.mk. (Also see # that file for more information on USE_EFL_*). +# USE_FPC - If set, this port relies on the Free Pascal language. +# Implies inclusion of bsd.fpc.mk. (Also see +# that file for more information on WANT_FPC_*). # USE_JAVA - If set, this port relies on the Java language. # Implies inclusion of bsd.java.mk. (Also see # that file for more information on USE_JAVA_*). @@ -441,6 +444,9 @@ # (Also see that file for more information on # USE_GNUSTEP_*). ## +# USE_GECKO - If set, this port uses the Gecko/Mozilla product. +# See bsd.gecko.mk for more details. +## # USE_GNOME - A list of the Gnome dependencies the port has (e.g., # glib12, gtk12). Implies that the port needs Gnome. # Implies inclusion of bsd.gnome.mk. See bsd.gnome.mk @@ -1462,6 +1468,10 @@ .include "${PORTSDIR}/Mk/bsd.efl.mk" .endif +.if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL) +.include "${PORTSDIR}/Mk/bsd.fpc.mk" +.endif + .if defined(USE_JAVA) .include "${PORTSDIR}/Mk/bsd.java.mk" .endif @@ -1490,6 +1500,10 @@ .include "${PORTSDIR}/Mk/bsd.qt.mk" .endif +.if defined(WANT_GECKO) || defined(USE_GECKO) +.include "${PORTSDIR}/Mk/bsd.gecko.mk" +.endif + .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif @@ -1999,6 +2013,10 @@ .include "${PORTSDIR}/Mk/bsd.autotools.mk" .endif +.if defined(WANT_GECKO) || defined(USE_GECKO) +.include "${PORTSDIR}/Mk/bsd.gecko.mk" +.endif + .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif @@ -2335,6 +2353,9 @@ ALL_TARGET?= all INSTALL_TARGET?= install +# Integrate with the license auditing framework +.include "${PORTSDIR}/Mk/bsd.licenses.mk" + # Popular master sites .include "bsd.sites.mk" @@ -4064,15 +4085,15 @@ .endif _SANITY_SEQ= ${_CHROOT_SEQ} pre-everything check-makefile check-categories \ check-makevars check-desktop-entries check-depends \ - check-deprecated check-vulnerable buildanyway-message \ - options-message + check-deprecated check-vulnerable check-license \ + buildanyway-message options-message _FETCH_DEP= check-sanity _FETCH_SEQ= fetch-depends pre-fetch pre-fetch-script \ do-fetch post-fetch post-fetch-script _EXTRACT_DEP= fetch _EXTRACT_SEQ= extract-message checksum extract-depends pre-extract \ pre-extract-script do-extract \ - post-extract post-extract-script + post-extract post-extract-script ask-license _PATCH_DEP= extract _PATCH_SEQ= patch-message patch-depends patch-dos2unix pre-patch \ pre-patch-script do-patch post-patch post-patch-script @@ -4089,7 +4110,7 @@ pre-install-script generate-plist check-already-installed _INSTALL_SUSEQ= check-umask install-mtree pre-su-install \ pre-su-install-script do-install install-desktop-entries \ - post-install post-install-script add-plist-info \ + install-license post-install post-install-script add-plist-info \ add-plist-docs add-plist-examples add-plist-data \ add-plist-post install-rc-script compress-man \ install-ldconfig-file fake-pkg security-check @@ -5727,6 +5748,9 @@ ${CAT} /tmp/${PKGNAME}-required-by >> ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY; \ ${RM} -f /tmp/${PKGNAME}-required-by; \ fi +.if defined(REGISTER_LICENSE) +# XXX concat prepared file to +CONTENTS (or directly use .if exists()) +.endif .else @${DO_NADA} .endif ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.ruby.mk#2 (text+ko) ==== @@ -3,7 +3,7 @@ # # Created by: Akinori MUSHA # -# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.168 2008/04/06 10:29:53 stas Exp $ +# $FreeBSD: ports/Mk/bsd.ruby.mk,v 1.170 2008/06/25 23:00:27 stas Exp $ # .if !defined(Ruby_Include) @@ -167,7 +167,7 @@ # Ruby 1.8 # RUBY_RELVERSION= 1.8.6 -RUBY_PORTREVISION= 2 +RUBY_PORTREVISION= 4 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 111 ==== //depot/projects/soc2008/alepulver-portslicense/ports/Mk/bsd.sites.mk#2 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.451 2008/06/02 07:42:56 itetcu Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.453 2008/06/23 12:18:35 tdb Exp $ # # Where to put distfiles that don't have any other master site @@ -1184,9 +1184,9 @@ # List: http://dl.sv.gnu.org/releases/00_MIRRORS.html .if !defined(IGNORE_MASTER_SITE_SAVANNAH) MASTER_SITE_SAVANNAH+= \ - http://download.savannah.nongnu.org/releases/%SUBDIR%/ \ - http://www.de-mirrors.de/nongnu/%SUBDIR%/ \ + http://download.savannah.gnu.org/releases/%SUBDIR%/ \ http://ftp.cc.uoc.gr/mirrors/nongnu.org/%SUBDIR%/ \ + http://www.very-clever.com/download/nongnu/%SUBDIR%/ \ http://ftp.twaren.net/Unix/NonGNU/%SUBDIR%/ \ ftp://ftp.cc.uoc.gr/mirrors/nongnu.org/%SUBDIR%/ \ ftp://ftp.twaren.net/Unix/NonGNU/%SUBDIR%/ @@ -1306,8 +1306,6 @@ http://ftp.isu.edu.tw/pub/Linux/SuSE/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.suse.com/pub/suse/%SUBDIR%/ \ http://www.mirrorservice.org/sites/ftp.suse.com/pub/suse/%SUBDIR%/ \ - ftp://ftp.mirror.ac.uk/sites/ftp.suse.com/%SUBDIR%/ \ - http://download.mirror.ac.uk/sites/ftp.suse.com/%SUBDIR%/ \ ftp://ftp.kde.org/pub/suse/ftp.suse.com/suse/%SUBDIR%/ \ ftp://ftp.suse.com/pub/suse/%SUBDIR%/ \ ftp://ftp.softnet.tuc.gr/pub/linux/suse/suse/%SUBDIR%/ \ From owner-p4-projects@FreeBSD.ORG Mon Jul 7 08:43:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C09421065684; Mon, 7 Jul 2008 08:43: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 8315E106567B; Mon, 7 Jul 2008 08:43:18 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from watery.cc.kogakuin.ac.jp (watery.cc.kogakuin.ac.jp [133.80.152.80]) by mx1.freebsd.org (Postfix) with ESMTP id 37D9E8FC1B; Mon, 7 Jul 2008 08:43:18 +0000 (UTC) (envelope-from nyan@jp.FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) by watery.cc.kogakuin.ac.jp (unknown) with ESMTP id m678hGNq023524; Mon, 7 Jul 2008 17:43:16 +0900 (JST) (envelope-from nyan@jp.FreeBSD.org) Date: Mon, 07 Jul 2008 17:42:08 +0900 (JST) Message-Id: <20080707.174208.94913728.nyan@jp.FreeBSD.org> To: xcllnt@mac.com From: Takahashi Yoshihiro In-Reply-To: References: <200807051943.m65JhHZ6066371@repoman.freebsd.org> <20080706.110943.226722229.nyan@jp.FreeBSD.org> X-Mailer: Mew version 6.1 on Emacs 22.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: marcel@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 144741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 08:43:19 -0000 In article Marcel Moolenaar writes: > > These are wrong. RSA98-III is based on ns8250 and has extended FIFO > > buffer. So I think that the uart_rsa_class should be added. > > Oh. In your patch you define it as i8251. I only refactored > the code. Also, the ns8250 class already supports extended > FIFOs, so we don't need a separate class for that. I'll > change it... No. My code set sc_class to uart_rsa_class. It's your mistake. And then I found another problem in uart_bus_isa.c. In your code non-PnP devices for pc98 cannot probe. My original code was no problem... And, RSA has extra registers to control its FIFO buffer. So we need additional code to support it. See: sys/dev/ic/rsa.h and sys/pc98/cbus/sio.c --- TAKAHASHI Yoshihiro From owner-p4-projects@FreeBSD.ORG Mon Jul 7 08:44:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 952EF1065678; Mon, 7 Jul 2008 08:44: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 3FD661065676 for ; Mon, 7 Jul 2008 08:44:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2B1C48FC27 for ; Mon, 7 Jul 2008 08:44:59 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m678ixAr085678 for ; Mon, 7 Jul 2008 08:44:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m678iwZT085676 for perforce@freebsd.org; Mon, 7 Jul 2008 08:44:58 GMT (envelope-from jb@freebsd.org) Date: Mon, 7 Jul 2008 08:44:58 GMT Message-Id: <200807070844.m678iwZT085676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 144809 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 08:44:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=144809 Change 144809 by jb@freebsd3 on 2008/07/07 08:44:49 IF7 Affected files ... .. //depot/projects/dtrace7/src/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/dtrace7/src/etc/devd.conf#2 integrate .. //depot/projects/dtrace7/src/etc/periodic/security/800.loginfail#2 integrate .. //depot/projects/dtrace7/src/lib/libc/stdlib/system.3#2 integrate .. //depot/projects/dtrace7/src/lib/libc/sys/mkdir.2#3 integrate .. //depot/projects/dtrace7/src/sbin/devfs/devfs.8#2 integrate .. //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.c#3 integrate .. //depot/projects/dtrace7/src/share/man/man4/Makefile#8 integrate .. //depot/projects/dtrace7/src/share/man/man4/auditpipe.4#2 integrate .. //depot/projects/dtrace7/src/share/man/man4/k8temp.4#1 branch .. //depot/projects/dtrace7/src/share/man/man4/snd_emu10kx.4#2 integrate .. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/dtrace7/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/dtrace7/src/sys/conf/NOTES#7 integrate .. //depot/projects/dtrace7/src/sys/conf/files#14 integrate .. //depot/projects/dtrace7/src/sys/conf/files.amd64#6 integrate .. //depot/projects/dtrace7/src/sys/ddb/db_capture.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/dtrace7/src/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/dtrace7/src/sys/dev/acpi_support/acpi_asus.c#4 integrate .. //depot/projects/dtrace7/src/sys/dev/et/if_et.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/et/if_etreg.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/et/if_etvar.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/k8temp/k8temp.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/dtrace7/src/sys/dev/mii/truephy.c#1 branch .. //depot/projects/dtrace7/src/sys/dev/mii/truephyreg.h#1 branch .. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/dtrace7/src/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/dtrace7/src/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs.h#2 integrate .. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/dtrace7/src/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/dtrace7/src/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/dtrace7/src/sys/modules/Makefile#15 integrate .. //depot/projects/dtrace7/src/sys/modules/et/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/k8temp/Makefile#1 branch .. //depot/projects/dtrace7/src/sys/modules/mii/Makefile#4 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/dtrace7/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/dtrace7/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/dtrace7/src/sys/pci/viapm.c#2 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit.h#3 integrate .. //depot/projects/dtrace7/src/sys/security/audit/audit_worker.c#5 integrate .. //depot/projects/dtrace7/src/sys/sparc64/include/in_cksum.h#2 integrate .. //depot/projects/dtrace7/src/sys/sun4v/include/in_cksum.h#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ufs/extattr.h#2 integrate .. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/dtrace7/src/usr.bin/su/su.1#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/mountd/exports.5#2 integrate .. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate .. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate Differences ... ==== //depot/projects/dtrace7/src/contrib/gdtoa/gethex.c#2 (text+ko) ==== @@ -113,8 +113,11 @@ e += e1; } *sp = (char*)s; - if (zret) - return havedig ? STRTOG_Zero : STRTOG_NoNumber; + if (zret) { + if (!havedig) + *sp = s0 - 1; + return STRTOG_Zero; + } n = s1 - s0 - 1; for(k = 0; n > 7; n >>= 1) k++; ==== //depot/projects/dtrace7/src/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.38.2.1 2008/07/01 21:36:03 rpaulo Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -252,6 +252,28 @@ action "/etc/rc.resume acpi $notify"; }; +# The next blocks enable volume hotkeys that can be found on the Asus EeePC +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x13"; + action "mixer 0"; +}; + +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x14"; + action "mixer vol -10"; +}; + +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x15"; + action "mixer vol +10"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might ==== //depot/projects/dtrace7/src/etc/periodic/security/800.loginfail#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8.2.1 2008/07/06 10:21:12 mtm Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*: .*(fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/dtrace7/src/lib/libc/stdlib/system.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)system.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/system.3,v 1.12 2007/01/09 00:28:10 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/system.3,v 1.12.2.1 2008/06/30 09:16:22 danger Exp $ .\" .Dd June 4, 1993 .Dt SYSTEM 3 @@ -70,7 +70,7 @@ will return non-zero if the command interpreter .Xr sh 1 is available, and zero if it is not. -.Pp +.Sh RETURN VALUES The .Fn system function ==== //depot/projects/dtrace7/src/lib/libc/sys/mkdir.2#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.24.2.1 2008/04/30 23:32:12 scf Exp $ +.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.24.2.2 2008/06/30 09:06:19 danger Exp $ .\" -.Dd December 9, 2006 +.Dd June 26, 2008 .Dt MKDIR 2 .Os .Sh NAME @@ -80,6 +80,9 @@ manual page for more information. .It Bq Er EROFS The named directory would reside on a read-only file system. +.It Bq Er EMLINK +The new directory cannot be created because the parent directory contains +too many subdirectories. .It Bq Er EEXIST The named file exists. .It Bq Er ENOSPC ==== //depot/projects/dtrace7/src/sbin/devfs/devfs.8#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.18 2006/12/29 22:45:12 danger Exp $ +.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.18.2.1 2008/07/02 13:03:08 mtm Exp $ .\" -.Dd November 5, 2006 +.Dd July 1, 2008 .Dt DEVFS 8 .Os .Sh NAME @@ -312,7 +312,7 @@ .Xr snp 4 devices. .Pp -.Dl "devfs rule -s 20 add major 53 group games" +.Dl "devfs rule -s 20 add type disk group wheel" .Pp Add a rule to ruleset number 20. Since this ruleset is not the current ruleset for any mount-points, ==== //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.8#3 (text+ko) ==== @@ -39,9 +39,9 @@ .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37.2.1 2007/12/02 08:47:28 remko Exp $ +.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37.2.2 2008/07/05 08:14:04 marck Exp $ .\" -.Dd November 28, 2007 +.Dd July 5, 2008 .Dt MDCONFIG 8 .Os .Sh NAME @@ -65,6 +65,7 @@ .Nm .Fl l .Op Fl n +.Op Fl v .Op Fl u Ar unit .Sh DESCRIPTION The @@ -119,6 +120,9 @@ If given with .Fl u , display details about that particular device. +If +.Fl v +option specified, show all details. .It Fl n When printing md device names, print only the unit number without the md prefix. ==== //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.c#3 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54.2.1 2007/12/06 11:54:36 flz Exp $ + * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54.2.2 2008/07/05 08:14:04 marck Exp $ * */ #include @@ -59,7 +59,7 @@ " [-s size] [-S sectorsize] [-u unit]\n" " [-x sectors/track] [-y heads/cyl]\n" " mdconfig -d -u unit\n" -" mdconfig -l [-n] [-u unit]\n"); +" mdconfig -l [-v] [-n] [-u unit]\n"); fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n"); fprintf(stderr, "\t\toption = {cluster, compress, reserve}\n"); fprintf(stderr, "\t\tsize = %%d (512 byte blocks), %%db (B),\n"); @@ -71,7 +71,7 @@ int main(int argc, char **argv) { - int ch, fd, i; + int ch, fd, i, vflag; char *p; int cmdline = 0; char *mdunit; @@ -80,9 +80,10 @@ mdio.md_file = malloc(PATH_MAX); if (mdio.md_file == NULL) err(1, "could not allocate memory"); + vflag = 0; bzero(mdio.md_file, PATH_MAX); for (;;) { - ch = getopt(argc, argv, "ab:df:lno:s:S:t:u:x:y:"); + ch = getopt(argc, argv, "ab:df:lno:s:S:t:u:vx:y:"); if (ch == -1) break; switch (ch) { @@ -237,6 +238,11 @@ mdunit = optarg; mdio.md_options &= ~MD_AUTOUNIT; break; + case 'v': + if (cmdline != 3) + usage(); + vflag = OPT_VERBOSE; + break; case 'x': if (cmdline != 2) usage(); @@ -282,7 +288,7 @@ * Listing all devices. This is why we pass NULL * together with OPT_LIST. */ - md_list(NULL, OPT_LIST); + md_list(NULL, OPT_LIST | vflag); } else { return (md_query(mdunit)); } @@ -373,13 +379,13 @@ } } opt |= OPT_DONE; - if (opt & OPT_LIST) + if ((opt & OPT_LIST) && !(opt & OPT_VERBOSE)) printf(" "); else printf("\n"); } } - if ((opt & OPT_LIST) && (opt & OPT_DONE)) + if ((opt & OPT_LIST) && (opt & OPT_DONE) && !(opt & OPT_VERBOSE)) printf("\n"); /* XXX: Check if it's enough to clean everything. */ geom_stats_snapshot_free(sq); ==== //depot/projects/dtrace7/src/share/man/man4/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.393.2.11 2008/05/09 02:23:11 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.393.2.12 2008/07/06 16:24:50 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ @@ -138,6 +138,7 @@ iwi.4 \ ixgb.4 \ joy.4 \ + k8temp.4 \ kbdmux.4 \ keyboard.4 \ kld.4 \ ==== //depot/projects/dtrace7/src/share/man/man4/auditpipe.4#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/auditpipe.4,v 1.5 2006/12/14 16:40:57 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/auditpipe.4,v 1.5.2.1 2008/06/30 18:35:11 rwatson Exp $ .\" .Dd May 5, 2006 .Os @@ -185,7 +185,7 @@ .It Dv AUDITPIPE_GET_PRESELECT_AUID Query the current preselection masks for a specific auid on the pipe. The ioctl argument should be of type -.Vt "struct auditpipe_preselect" . +.Vt "struct auditpipe_ioctl_preselect" . The auid to query is specified via the .Va ap_auid field of type ==== //depot/projects/dtrace7/src/share/man/man4/snd_emu10kx.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.5 2007/09/12 07:43:43 ariff Exp $ +.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.5.2.1 2008/07/06 11:08:50 danger Exp $ .\" -.Dd July 15, 2007 +.Dd May 28, 2008 .Dt SND_EMU10KX 4 .Os .Sh NAME @@ -61,7 +61,7 @@ .Sx MULTICHANNEL PLAYBACK for details), and MPU401-compatible MIDI I/O controller, which is accessible through the midi device. -Wave table synthesizer is not supported. +Wave table synthesizer support is not available. .Sh HARDWARE The .Nm @@ -90,7 +90,7 @@ .Nm driver does .Em not -support the following sound cards (although they are named +support the following sound cards (although they have names similar to some supported ones): .Pp .Bl -bullet -compact @@ -110,25 +110,29 @@ All Creative X-Fi series sound cards. .El .Sh MULTICHANNEL PLAYBACK -By default driver is loaded with multichannel playback capabilities enabled. +By default the +.Nm +driver is loaded with multichannel playback capabilities enabled. If you do not set the .Dv hint.emu10kx.0.multichannel_disabled option in your .Xr loader.conf 5 -configuration file you will get up to -five DSP devices, one for each sound card output. +configuration file you will get up to five DSP devices, one for each +sound card output. You can use additional software (like .Em audio/pulseaudio from -.Em The Ports Collection -) to do sound stream demultiplexing. +.Em The Ports Collection ) +to do sound stream demultiplexing. Only .Dq FRONT output can play and record sound from external sources (like line or S/PDIF inputs). .Sh MULTICHANNEL RECORDING By default multichannel recording capabilities are not enabled when you load -this driver. +the +.Nm +driver. If you enable the .Dv hint.emu10kx.0.multichannel_recording option in @@ -136,14 +140,14 @@ you will get one more DSP device that is rate-locked to 48kHz/16bit/mono. This is actually 48kHz/16bit/32 channels on SB Live! cards and 48kHz/16bit/64channels on Audigy cards, but the current implementation of -sound subsystem does not support such an amount of PCM channels. +the sound subsystem does not support such an amount of PCM channels. This device can not be opened for read, thus confusing many applications. .Pp -Within multichannel stream first half (0-15 or 0-31) is a copy of all DSP -outputs, second half (15-30 or 32-63) is a copy of some DSP inputs. -On Live! cards the last substream (31) is used as a sync stream and always +Within a multichannel stream, the first half (0-15 or 0-31) is a copy of all DSP +outputs, the second half (15-30 or 32-63) is a copy of some DSP inputs. +On Live! cards the last substream (31) is used as a sync stream and is always set to 0xc0de. -Audigy cards do not need such sync data, because stream always start with +Audigy cards do not need such sync data, because a stream always starts with substream 0. .Ss SB Live! substream map (in byte offsets, each substream is 2 bytes LE) .Bl -tag -width ".Dv +0x00..+0x1E" @@ -183,19 +187,20 @@ some DSP-based mixer controls. .Bl -inset .It Qq vol -mixer control is overall sound volume. +mixer control for the overall sound volume. .It Qq pcm -mixer control is PCM playback volume. +mixer control for the PCM playback volume. It controls only front output volume in multichannel mode and all output volume in single channel mode. .It Qq rec -mixer control acts very different on EMU10K1 and other cards. +mixer control acts very differently on EMU10K1 and other cards. On EMU10K1 cards it controls the AC97 codec recording level. -On non-EMU10K1 cards it controls the amount of AC97 "stereo mix" entering -the DSP. +On non-EMU10K1 cards it controls the amount of AC97 +.Dq stereo mix + entering the DSP. AC97 recording level and AC97 recording source are fixed on CA0100, CA0101, CA0102 and CA0108 cards. -AC97 recording level are always set to maximum and recording source is always +The AC97 recording levels are always set to maximum and recording source is always .Dq Li "stereo mix" . .It Qq dig1 is a CD S/PDIF (on-card) volume control @@ -210,26 +215,27 @@ is AudigyDrive "AUX In 2" volume control .El .Pp -Other OSS mixer controls control inputs of AC97 codec. +Other OSS mixer controls control the inputs of the AC97 codec. .Sh PRIVATE DEVICE CONTROLS -You can control some of EMU10Kx operation and configuration parameters through +You can control some of EMU10Kx's operation and configuration parameters through .Va dev.emu10kx. Ns Aq Ar X sysctls. These .Xr sysctl 8 -values are temporary and should not be relied -upon. +values are temporary and should not be relied upon. .Sh DRIVER CONFIGURATION Loader tunables are used to set driver configuration. Tunables can be set at the .Xr loader 8 prompt before booting the kernel or they can be stored in .Pa /boot/loader.conf . -These tunables can't be changed from a maching +These tunables cannot be changed from a machine .Xr sysctl 8 entry after boot, but you can change them using .Xr kenv 1 -while the driver is not loaded. +before loading the +.Nm +driver. .Bl -tag -width indent .It Va hint.emu10kx. Ns Ao Ar X Ac Ns Va .disabled Disables loading a driver instance. @@ -285,7 +291,7 @@ S/PDIF is not connected and S/PDIF volume is not zero. .Pp The PCM driver cannot detect the presence of Live!Drive or AudigyDrive -breakout boxes and tries to use them (and list their connectors in the +breakout boxes and tries to use them (and list their connectors in the mixer). .Pp The MIDI driver cannot detect the presence of Live!Drive or AudigyDrive ==== //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#8 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.7 2008/04/10 22:09:21 rwatson Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.8 2008/07/04 01:29:12 delphij Exp $ cpu HAMMER ident GENERIC @@ -197,6 +197,7 @@ device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes +device et # Agere ET1310 10/100/Gigabit Ethernet device fxp # Intel EtherExpress PRO/100B (82557, 82558) device lge # Level 1 LXT1001 gigabit Ethernet device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet ==== //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69.2.4 2008/02/03 07:28:37 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69.2.5 2008/07/06 16:24:50 rpaulo Exp $ # # @@ -455,8 +455,10 @@ # Temperature sensors: # # coretemp: on-die sensor on Intel Core and newer CPUs +# k8temp: on-die sensor on AMD K8 CPUs # device coretemp +device k8temp #--------------------------------------------------------------------------- # ISDN4BSD ==== //depot/projects/dtrace7/src/sys/amd64/include/vmparam.h#2 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49 2007/09/25 06:25:04 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49.2.1 2008/07/01 16:42:51 obrien Exp $ */ @@ -134,8 +134,17 @@ /* * Virtual addresses of things. Derived from the page directory and * page table indexes from pmap.h for precision. - * Because of the page that is both a PD and PT, it looks a little - * messy at times, but hey, we'll do anything to save a page :-) + * + * 0x0000000000000000 - 0x00007fffffffffff user map + * 0x0000800000000000 - 0xffff7fffffffffff does not exist (hole) + * 0xffff800000000000 - 0xffff804020100fff recursive page table (512GB slot) + * 0xffff804020101000 - 0xfffffeffffffffff unused + * 0xffffff0000000000 - 0xffffff7fffffffff 512GB direct map mappings + * 0xffffff8000000000 - 0xffffffff7fffffff unused (510GB) + * 0xffffffff80000000 - 0xffffffffffffffff 2GB kernel map + * + * Within the kernel map: + * 0xffffffff80000000 KERNBASE */ #define VM_MAX_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-1, NKPDE-1, NPTEPG-1) ==== //depot/projects/dtrace7/src/sys/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1454.2.9 2008/05/19 04:42:40 grog Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1454.2.11 2008/07/04 01:29:12 delphij Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1740,7 +1740,7 @@ # MII bus support is required for some PCI 10/100 ethernet NICs, # namely those which use MII-compliant transceivers or implement # transceiver control interfaces that operate like an MII. Adding -# "device miibus0" to the kernel config pulls in support for +# "device miibus" to the kernel config pulls in support for # the generic miibus API and all of the PHY drivers, including a # generic one for PHYs that aren't specifically handled by an # individual driver. @@ -1895,6 +1895,7 @@ device bge # Broadcom BCM570xx Gigabit Ethernet device cxgb # Chelsio T3 10 Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes +device et # Agere ET1310 10/100/Gigabit Ethernet device fxp # Intel EtherExpress PRO/100B (82557, 82558) hint.fxp.0.prefer_iomap="0" device gem # Apple GMAC/Sun ERI/Sun GEM ==== //depot/projects/dtrace7/src/sys/conf/files#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1243.2.24 2008/06/27 04:42:19 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1243.2.26 2008/07/04 01:29:12 delphij Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -636,6 +636,7 @@ compile-with "${NORMAL_C} -I$S/dev/em" dev/em/e1000_osdep.c optional em | igb \ compile-with "${NORMAL_C} -I$S/dev/em" +dev/et/if_et.c optional et dev/en/if_en_pci.c optional en pci dev/en/midway.c optional en dev/ep/if_ep.c optional ep @@ -814,6 +815,7 @@ dev/mii/ruephy.c optional miibus | ruephy dev/mii/tdkphy.c optional miibus | tdkphy dev/mii/tlphy.c optional miibus | tlphy +dev/mii/truephy.c optional miibus | truephy dev/mii/ukphy.c optional miibus | mii dev/mii/ukphy_subr.c optional miibus | mii dev/mii/xmphy.c optional miibus | xmphy @@ -1693,7 +1695,7 @@ netatalk/aarp.c optional netatalk netatalk/at_control.c optional netatalk netatalk/at_proto.c optional netatalk -netatalk/at_rmx.c optional netatalkdebug +netatalk/at_rmx.c optional netatalk netatalk/ddp_input.c optional netatalk netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk ==== //depot/projects/dtrace7/src/sys/conf/files.amd64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.107.2.6 2008/04/10 22:09:22 rwatson Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.107.2.7 2008/07/06 16:24:50 rpaulo Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -187,6 +187,7 @@ dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc +dev/k8temp/k8temp.c optional k8temp dev/kbd/kbd.c optional atkbd | sc | ukbd dev/mem/memutil.c optional mem dev/nfe/if_nfe.c optional nfe pci ==== //depot/projects/dtrace7/src/sys/ddb/db_capture.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5.2.5 2008/04/01 11:31:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5.2.6 2008/07/01 12:15:55 rwatson Exp $"); #include "opt_ddb.h" @@ -83,13 +83,16 @@ static SYSCTL_NODE(_debug_ddb, OID_AUTO, capture, CTLFLAG_RW, 0, "DDB capture options"); -SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bytes, CTLFLAG_RD, +SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bufoff, CTLFLAG_RD, &db_capture_bufoff, 0, "Bytes of data in DDB capture buffer"); SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, maxbufsize, CTLFLAG_RD, &db_capture_maxbufsize, 0, "Maximum value for debug.ddb.capture.bufsize"); +SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD, + &db_capture_inprogress, 0, "DDB output capture in progress"); + /* * Boot-time allocation of the DDB capture buffer, if any. Force all buffer * sizes, including the maximum size, to be rounded to block sizes. ==== //depot/projects/dtrace7/src/sys/dev/aac/aac.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.120.2.11 2008/04/07 14:19:57 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.120.2.12 2008/07/01 22:16:33 emaste Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -2998,6 +2998,7 @@ aac_poll(struct cdev *dev, int poll_events, d_thread_t *td) { struct aac_softc *sc; + struct aac_fib_context *ctx; int revents; sc = dev->si_drv1; @@ -3005,8 +3006,12 @@ mtx_lock(&sc->aac_aifq_lock); if ((poll_events & (POLLRDNORM | POLLIN)) != 0) { - if (sc->aifq_idx != 0 || sc->aifq_filled) - revents |= poll_events & (POLLIN | POLLRDNORM); + for (ctx = sc->fibctx; ctx; ctx = ctx->next) { + if (ctx->ctx_idx != sc->aifq_idx || ctx->ctx_wrap) { + revents |= poll_events & (POLLIN | POLLRDNORM); + break; + } + } } mtx_unlock(&sc->aac_aifq_lock); ==== //depot/projects/dtrace7/src/sys/dev/aac/aac_disk.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.43.10.2 2008/03/31 19:21:49 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.43.10.3 2008/07/02 14:17:49 emaste Exp $"); #include "opt_aac.h" @@ -183,9 +183,6 @@ /* * Map the S/G elements for doing a dump. - * - * XXX This does not handle >4GB of RAM. Fixing it is possible except on - * adapters that cannot do 64bit s/g lists. */ static void aac_dump_map_sg(void *arg, bus_dma_segment_t *segs, int nsegs, int error) @@ -212,6 +209,31 @@ } /* + * Map the S/G elements for doing a dump on 64-bit capable devices. + */ +static void +aac_dump_map_sg64(void *arg, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct aac_fib *fib; + struct aac_blockwrite64 *bw; + struct aac_sg_table64 *sg; + int i; + + fib = (struct aac_fib *)arg; + bw = (struct aac_blockwrite64 *)&fib->data[0]; + sg = &bw->SgMap64; + + if (sg != NULL) { + sg->SgCount = nsegs; + for (i = 0; i < nsegs; i++) { + sg->SgEntry64[i].SgAddress = segs[i].ds_addr; + sg->SgEntry64[i].SgByteCount = segs[i].ds_len; + } + fib->Header.Size = nsegs * sizeof(struct aac_sg_entry64); + } +} + +/* * Dump memory out to an array * * Send out one command at a time with up to AAC_MAXIO of data. @@ -222,12 +244,13 @@ struct aac_disk *ad; struct aac_softc *sc; struct aac_fib *fib; - struct aac_blockwrite *bw; size_t len; int size; static bus_dmamap_t dump_datamap; static int first = 0; struct disk *dp; + bus_dmamap_callback_t *callback; + u_int32_t command; dp = arg; ad = dp->d_drv1; @@ -247,15 +270,33 @@ /* Skip aac_alloc_sync_fib(). We don't want to mess with sleep locks */ fib = &sc->aac_common->ac_sync_fib; - bw = (struct aac_blockwrite *)&fib->data[0]; while (length > 0) { len = (length > AAC_MAXIO) ? AAC_MAXIO : length; - bw->Command = VM_CtBlockWrite; - bw->ContainerId = ad->ad_container->co_mntobj.ObjectId; - bw->BlockNumber = offset / AAC_BLOCK_SIZE; - bw->ByteCount = len; - bw->Stable = CUNSTABLE; + if ((sc->flags & AAC_FLAGS_SG_64BIT) == 0) { + struct aac_blockwrite *bw; + bw = (struct aac_blockwrite *)&fib->data[0]; + bw->Command = VM_CtBlockWrite; + bw->ContainerId = ad->ad_container->co_mntobj.ObjectId; + bw->BlockNumber = offset / AAC_BLOCK_SIZE; + bw->ByteCount = len; + bw->Stable = CUNSTABLE; + command = ContainerCommand; + callback = aac_dump_map_sg; + size = sizeof(struct aac_blockwrite); + } else { + struct aac_blockwrite64 *bw; + bw = (struct aac_blockwrite64 *)&fib->data[0]; + bw->Command = VM_CtHostWrite64; + bw->ContainerId = ad->ad_container->co_mntobj.ObjectId; + bw->BlockNumber = offset / AAC_BLOCK_SIZE; + bw->SectorCount = len / AAC_BLOCK_SIZE; + bw->Pad = 0; + bw->Flags = 0; + command = ContainerCommand64; + callback = aac_dump_map_sg64; + size = sizeof(struct aac_blockwrite64); + } /* * There really isn't any way to recover from errors or @@ -264,16 +305,16 @@ * is too much required context. */ if (bus_dmamap_load(sc->aac_buffer_dmat, dump_datamap, virtual, - len, aac_dump_map_sg, fib, BUS_DMA_NOWAIT) != 0) + len, callback, fib, BUS_DMA_NOWAIT) != 0) return (ENOMEM); bus_dmamap_sync(sc->aac_buffer_dmat, dump_datamap, BUS_DMASYNC_PREWRITE); /* fib->Header.Size is set in aac_dump_map_sg */ - size = fib->Header.Size + sizeof(struct aac_blockwrite); + size += fib->Header.Size; - if (aac_sync_fib(sc, ContainerCommand, 0, fib, size)) { + if (aac_sync_fib(sc, command, 0, fib, size)) { printf("Error dumping block 0x%jx\n", (uintmax_t)physical); return (EIO); ==== //depot/projects/dtrace7/src/sys/dev/acpi_support/acpi_asus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.30.2.2 2008/04/22 12:44:39 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.30.2.3 2008/07/01 21:36:03 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -55,6 +55,8 @@ #define ACPI_ASUS_METHOD_BRN 1 #define ACPI_ASUS_METHOD_DISP 2 #define ACPI_ASUS_METHOD_LCD 3 +#define ACPI_ASUS_METHOD_CAMERA 4 +#define ACPI_ASUS_METHOD_CARDRD 5 #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASUS") @@ -79,6 +81,14 @@ char *disp_get; char *disp_set; + + char *cam_get; + char *cam_set; + + char *crd_get; + char *crd_set; + + void (*n_func)(ACPI_HANDLE, UINT32, void *); }; struct acpi_asus_led { @@ -114,6 +124,8 @@ int s_brn; int s_disp; int s_lcd; + int s_cam; + int s_crd; }; /* @@ -375,6 +387,8 @@ { .name = NULL } }; +static void acpi_asus_eeepc_notify(ACPI_HANDLE h, UINT32 notify, void *context); + /* * EeePC have an Asus ASUS010 gadget interface, * but they can't be probed quite the same way as Asus laptops. @@ -383,7 +397,12 @@ { .name = "EEE", .brn_get = "\\_SB.ATKD.PBLG", - .brn_set = "\\_SB.ATKD.PBLS" + .brn_set = "\\_SB.ATKD.PBLS", + .cam_get = "\\_SB.ATKD.CAMG", + .cam_set = "\\_SB.ATKD.CAMS", + .crd_set = "\\_SB.ATKD.CRDS", + .crd_get = "\\_SB.ATKD.CRDG", + .n_func = acpi_asus_eeepc_notify }, { .name = NULL } @@ -393,21 +412,37 @@ char *name; char *description; int method; + int flags; } acpi_asus_sysctls[] = { { .name = "lcd_backlight", .method = ACPI_ASUS_METHOD_LCD, - .description = "state of the lcd backlight" + .description = "state of the lcd backlight", + .flags = CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY }, { .name = "lcd_brightness", .method = ACPI_ASUS_METHOD_BRN, - .description = "brightness of the lcd panel" + .description = "brightness of the lcd panel", + .flags = CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY }, { .name = "video_output", .method = ACPI_ASUS_METHOD_DISP, - .description = "display output state" + .description = "display output state", + .flags = CTLTYPE_INT | CTLFLAG_RW + }, + { + .name = "camera", + .method = ACPI_ASUS_METHOD_CAMERA, + .description = "internal camera state", + .flags = CTLTYPE_INT | CTLFLAG_RW + }, + { + .name = "cardreader", + .method = ACPI_ASUS_METHOD_CARDRD, + .description = "internal card reader state", + .flags = CTLTYPE_INT | CTLFLAG_RW }, { .name = NULL } @@ -647,7 +682,7 @@ SYSCTL_ADD_PROC(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, acpi_asus_sysctls[i].name, - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY, + acpi_asus_sysctls[i].flags, sc, i, acpi_asus_sysctl, "I", acpi_asus_sysctls[i].description); } @@ -708,8 +743,11 @@ AcpiEvaluateObject(sc->handle, "BSTS", NULL, NULL); /* Handle notifies */ + if (sc->model->n_func == NULL) + sc->model->n_func = acpi_asus_notify; + AcpiInstallNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY, - acpi_asus_notify, dev); + sc->model->n_func, dev); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 7 12:10:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F3551065687; Mon, 7 Jul 2008 12:10: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 124DD106569C for ; Mon, 7 Jul 2008 12:10:28 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F34BF8FC22 for ; Mon, 7 Jul 2008 12:10:27 +0000 (UTC) (envelope-from snb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67CARHN023220 for ; Mon, 7 Jul 2008 12:10:27 GMT (envelope-from snb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67CAR63023218 for perforce@freebsd.org; Mon, 7 Jul 2008 12:10:27 GMT (envelope-from snb@FreeBSD.org) Date: Mon, 7 Jul 2008 12:10:27 GMT Message-Id: <200807071210.m67CAR63023218@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snb@FreeBSD.org using -f From: Nick Barkas To: Perforce Change Reviews Cc: Subject: PERFORCE change 144820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 12:10:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=144820 Change 144820 by snb@snb_toro on 2008/07/07 12:10:14 Remove unused function declaration. Affected files ... .. //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#6 edit Differences ... ==== //depot/projects/soc2008/snb-dirhash/sys-ufs-ufs/ufs_dirhash.c#6 (text+ko) ==== @@ -94,7 +94,6 @@ doff_t offset); static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset); static int ufsdirhash_destroy(struct dirhash *dh); -static int ufsdirhash_destroy_first(void); static int ufsdirhash_recycle(int wanted); static void ufsdirhash_lowmem(void); static void ufsdirhash_free_locked(struct inode *ip); From owner-p4-projects@FreeBSD.ORG Mon Jul 7 13:53:12 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70B40106566C; Mon, 7 Jul 2008 13:53: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 35528106567B for ; Mon, 7 Jul 2008 13:53:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 085798FC21 for ; Mon, 7 Jul 2008 13:53:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67DrBo5043173 for ; Mon, 7 Jul 2008 13:53:11 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67DrBU5043171 for perforce@freebsd.org; Mon, 7 Jul 2008 13:53:11 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 13:53:11 GMT Message-Id: <200807071353.m67DrBU5043171@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 13:53:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=144827 Change 144827 by trasz@trasz_traszkan on 2008/07/07 13:52:43 Fix a mismerge. This makes the p4 version of the kernel actually compilable. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#5 (text+ko) ==== @@ -170,6 +170,7 @@ */ vfs_deleteopt(mp->mnt_optnew, "snapshot"); vfs_deleteopt(mp->mnt_opt, "snapshot"); + } if (vfs_getopt(mp->mnt_optnew, "nfs4acls", NULL, NULL) == 0) { if (mntorflags & MNT_ACLS) { From owner-p4-projects@FreeBSD.ORG Mon Jul 7 14:45:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F3EC1065672; Mon, 7 Jul 2008 14:45: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 189FA106564A for ; Mon, 7 Jul 2008 14:45: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 051DF8FC14 for ; Mon, 7 Jul 2008 14:45:04 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67Ej3QR048712 for ; Mon, 7 Jul 2008 14:45:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67Ej3XF048710 for perforce@freebsd.org; Mon, 7 Jul 2008 14:45:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 7 Jul 2008 14:45:03 GMT Message-Id: <200807071445.m67Ej3XF048710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 144828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 14:45:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=144828 Change 144828 by hselasky@hselasky_laptop001 on 2008/07/07 14:44:04 More patches to add support for LibUSB 1.0 - allow multiple instances when opening an endpoint Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#9 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#11 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#9 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#9 (text+ko) ==== @@ -295,6 +295,8 @@ #define USB_NO_TIMEOUT 0 #define USB_DEFAULT_TIMEOUT 5000 /* 5000 ms = 5 seconds */ + uint32_t max_frame_count; /* initial value of "nframes" after + * setup */ uint32_t nframes; /* number of USB frames to transfer */ uint32_t aframes; /* actual number of USB frames * transferred */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#11 (text+ko) ==== @@ -71,7 +71,6 @@ static uint32_t usb2_path_convert_one(const char **pp); static uint32_t usb2_path_convert(const char *path); static uint8_t usb2_match_perm(struct usb2_perm *psystem, struct usb2_perm *puser); -static struct usb2_fifo *usb2_fifo_alloc(uint8_t fifo_index); static int usb2_fifo_open(struct usb2_fifo *f, struct file *fp, struct thread *td, int fflags); static void usb2_fifo_close(struct usb2_fifo *f, struct thread *td, int fflags); static void usb2_dev_init(void *arg); @@ -81,6 +80,8 @@ static void usb2_fifo_wakeup(struct usb2_fifo *f); static void usb2_fifo_check_methods(struct usb2_fifo_methods *pm); static void usb2_clone(void *arg, USB_UCRED char *name, int namelen, struct cdev **dev); +static struct usb2_fifo *usb2_fifo_alloc(void); +static struct usb2_pipe *usb2_dev_get_pipe(struct usb2_device *udev, uint8_t iface_index, uint8_t ep_index, uint8_t dir); static d_fdopen_t usb2_fdopen; static d_close_t usb2_close; @@ -200,7 +201,7 @@ temp = usb2_path_convert_one(&path); - if (temp >= USB_FIFO_MAX) { + if (temp >= ((USB_FIFO_MAX / 2) + (USB_EP_MAX / 2))) { return (0 - 1); } devloc += (temp * USB_IFACE_MAX * USB_DEV_MAX * USB_BUS_MAX); @@ -280,25 +281,32 @@ usb2_error_t usb2_ref_device(struct file *fp, struct usb2_location *ploc, uint32_t devloc) { + struct usb2_fifo **ppf; + struct usb2_fifo *f; int fflags; if (fp) { - /* get the device location */ + /* + * Get the device location which should be valid and + * correct: + */ devloc = USB_P2U(fp->f_data); fflags = fp->f_flag; /* only ref FIFO */ ploc->is_uref = 0; + /* devloc should be valid */ } else { /* only ref device */ fflags = 0; + /* search for FIFO */ ploc->is_uref = 1; + /* check "devloc" */ + if (devloc >= (USB_BUS_MAX * USB_DEV_MAX * + USB_IFACE_MAX * ((USB_EP_MAX / 2) + (USB_FIFO_MAX / 2)))) { + return (USB_ERR_INVAL); + } } - if (devloc > (USB_BUS_MAX * USB_DEV_MAX * - USB_EP_MAX * USB_IFACE_MAX)) { - /* invalid device location */ - return (USB_ERR_INVAL); - } /* store device location */ ploc->devloc = devloc; ploc->bus_index = devloc % USB_BUS_MAX; @@ -306,7 +314,7 @@ ploc->iface_index = (devloc / (USB_BUS_MAX * USB_DEV_MAX)) % USB_IFACE_MAX; ploc->ep_index = (devloc / (USB_BUS_MAX * USB_DEV_MAX * - USB_IFACE_MAX)) % USB_EP_MAX; + USB_IFACE_MAX)); mtx_lock(&usb2_ref_lock); ploc->bus = devclass_get_softc(usb2_devclass_ptr, ploc->bus_index); @@ -339,50 +347,68 @@ goto error; } } - /* check TX FIFO */ - - ploc->txfifo = ploc->udev->fifo[(2 * ploc->ep_index) + USB_FIFO_TX]; - if ((ploc->txfifo != NULL) && - (ploc->txfifo->refcount != USB_FIFO_REF_MAX) && - (ploc->txfifo->curr_file == fp)) { - ploc->is_write = 1; /* ref */ + /* check if we are doing an open */ + if (fp == NULL) { + /* set defaults */ + ploc->txfifo = NULL; + ploc->rxfifo = NULL; + ploc->is_write = 0; + ploc->is_read = 0; } else { + /* check for write */ if (fflags & FWRITE) { - goto error; + ppf = ploc->udev->fifo; + f = ppf[ploc->ep_index + USB_FIFO_TX]; + ploc->txfifo = f; + ploc->is_write = 1; /* ref */ + if ((f == NULL) || + (f->refcount == USB_FIFO_REF_MAX) || + (f->curr_file != fp)) { + goto error; + } + } else { + ploc->txfifo = NULL; + ploc->is_write = 0; /* no ref */ } - ploc->is_write = 0; /* no ref */ - ploc->txfifo = NULL; /* no access */ - } - /* check RX FIFO */ - - ploc->rxfifo = ploc->udev->fifo[(2 * ploc->ep_index) + USB_FIFO_RX]; - if ((ploc->rxfifo != NULL) && - (ploc->rxfifo->refcount != USB_FIFO_REF_MAX) && - (ploc->rxfifo->curr_file == fp)) { - ploc->is_read = 1; /* ref */ - } else { + /* check for read */ if (fflags & FREAD) { - goto error; + ppf = ploc->udev->fifo; + f = ppf[ploc->ep_index + USB_FIFO_RX]; + ploc->rxfifo = f; + ploc->is_read = 1; /* ref */ + if ((f == NULL) || + (f->refcount == USB_FIFO_REF_MAX) || + (f->curr_file != fp)) { + goto error; + } + } else { + ploc->rxfifo = NULL; + ploc->is_read = 0; /* no ref */ } - ploc->is_read = 0; /* no ref */ - ploc->rxfifo = NULL; /* no access */ } /* when everything is OK we increment the refcounts */ - - if (ploc->is_uref) { - DPRINTF(1, "ref udev\n"); - ploc->udev->refcount++; - } if (ploc->is_write) { DPRINTF(1, "ref write\n"); ploc->txfifo->refcount++; + if (ploc->txfifo->flag_no_uref == 0) { + /* we need extra locking */ + ploc->is_uref = 1; + } } if (ploc->is_read) { DPRINTF(1, "ref read\n"); ploc->rxfifo->refcount++; + if (ploc->rxfifo->flag_no_uref == 0) { + /* we need extra locking */ + ploc->is_uref = 1; + } } + if (ploc->is_uref) { + DPRINTF(1, "ref udev\n"); + ploc->udev->refcount++; + } mtx_unlock(&usb2_ref_lock); if (ploc->is_uref) { @@ -435,21 +461,178 @@ } static struct usb2_fifo * -usb2_fifo_alloc(uint8_t fifo_index) +usb2_fifo_alloc(void) { struct usb2_fifo *f; f = malloc(sizeof(*f), M_USBDEV, M_WAITOK | M_ZERO); - if (f) { cv_init(&f->cv_io, "FIFO-IO"); cv_init(&f->cv_drain, "FIFO-DRAIN"); f->refcount = 1; - f->fifo_index = fifo_index; } return (f); } +/*------------------------------------------------------------------------* + * usb2_fifo_create + *------------------------------------------------------------------------*/ +static int +usb2_fifo_create(struct usb2_location *ploc, uint32_t *pdevloc, int fflags) +{ + struct usb2_device *udev = ploc->udev; + struct usb2_fifo *f; + struct usb2_pipe *pipe; + uint8_t iface_index = ploc->iface_index; + uint8_t dev_ep_index = ploc->ep_index; + uint8_t n; + uint8_t is_tx; + uint8_t is_rx; + uint8_t no_null; + uint8_t is_busy; + + is_tx = (fflags & FWRITE) ? 1 : 0; + is_rx = (fflags & FREAD) ? 1 : 0; + no_null = 1; + is_busy = 0; + + /* search for a free FIFO slot */ + + for (n = 0;; n += 2) { + + if (n == USB_FIFO_MAX) { + if (no_null) { + no_null = 0; + n = 0; + } else { + /* end of FIFOs reached */ + return (ENOMEM); + } + } + /* Check for TX FIFO */ + if (is_tx) { + f = udev->fifo[n + USB_FIFO_TX]; + if (f != NULL) { + if (f->dev_ep_index != dev_ep_index) { + /* wrong endpoint index */ + continue; + } + if ((dev_ep_index != 0) && + (f->iface_index != iface_index)) { + /* wrong interface index */ + continue; + } + if (f->curr_file != NULL) { + /* FIFO is opened */ + is_busy = 1; + continue; + } + } else if (no_null) { + continue; + } + } + /* Check for RX FIFO */ + if (is_rx) { + f = udev->fifo[n + USB_FIFO_RX]; + if (f != NULL) { + if (f->dev_ep_index != dev_ep_index) { + /* wrong endpoint index */ + continue; + } + if ((dev_ep_index != 0) && + (f->iface_index != iface_index)) { + /* wrong interface index */ + continue; + } + if (f->curr_file != NULL) { + /* FIFO is opened */ + is_busy = 1; + continue; + } + } else if (no_null) { + continue; + } + } + break; + } + + if (no_null == 0) { + if (dev_ep_index >= (USB_EP_MAX / 2)) { + /* we don't create any endpoints in this range */ + return (is_busy ? EBUSY : EINVAL); + } + } + /* Check TX FIFO */ + if (is_tx && + (udev->fifo[n + USB_FIFO_TX] == NULL)) { + pipe = usb2_dev_get_pipe(udev, + iface_index, dev_ep_index, USB_FIFO_TX); + if (pipe == NULL) { + return (EINVAL); + } + f = usb2_fifo_alloc(); + if (f == NULL) { + return (ENOMEM); + } + /* update some fields */ + f->fifo_index = n + USB_FIFO_TX; + f->dev_ep_index = dev_ep_index; + f->priv_mtx = udev->default_mtx; + f->priv_sc0 = pipe; + f->methods = &usb2_ugen_methods; + f->iface_index = iface_index; + f->udev = udev; + if (dev_ep_index != 0) { + f->flag_no_uref = 1; + } + mtx_lock(&usb2_ref_lock); + udev->fifo[n + USB_FIFO_TX] = f; + mtx_unlock(&usb2_ref_lock); + } + /* Check RX FIFO */ + if (is_rx && + (udev->fifo[n + USB_FIFO_RX] == NULL)) { + + pipe = usb2_dev_get_pipe(udev, + iface_index, dev_ep_index, USB_FIFO_RX); + if (pipe == NULL) { + return (EINVAL); + } + f = usb2_fifo_alloc(); + if (f == NULL) { + return (ENOMEM); + } + /* update some fields */ + f->fifo_index = n + USB_FIFO_RX; + f->dev_ep_index = dev_ep_index; + f->priv_mtx = udev->default_mtx; + f->priv_sc0 = pipe; + f->methods = &usb2_ugen_methods; + f->iface_index = iface_index; + f->udev = udev; + if (dev_ep_index != 0) { + f->flag_no_uref = 1; + } + mtx_lock(&usb2_ref_lock); + udev->fifo[n + USB_FIFO_RX] = f; + mtx_unlock(&usb2_ref_lock); + } + if (is_tx) { + ploc->txfifo = udev->fifo[n + USB_FIFO_TX]; + } + if (is_rx) { + ploc->rxfifo = udev->fifo[n + USB_FIFO_RX]; + } + /* replace endpoint index by FIFO index */ + + (*pdevloc) %= (USB_BUS_MAX * USB_DEV_MAX * USB_IFACE_MAX); + (*pdevloc) += (USB_BUS_MAX * USB_DEV_MAX * USB_IFACE_MAX) * n; + + /* complete */ + + return (0); +} + void usb2_fifo_free(struct usb2_fifo *f) { @@ -470,7 +653,8 @@ /* delink ourselves to stop calls from userland */ if ((f->fifo_index < USB_FIFO_MAX) && - (f->udev != NULL)) { + (f->udev != NULL) && + (f->udev->fifo[f->fifo_index] == f)) { f->udev->fifo[f->fifo_index] = NULL; } else { DPRINTF(-1, "USB FIFO %p has not been linked!\n", f); @@ -505,44 +689,17 @@ return; } -/*------------------------------------------------------------------------* - * usb2_fifo_check - *------------------------------------------------------------------------*/ -static void -usb2_fifo_check(struct usb2_location *ploc, int fflags) +static struct usb2_pipe * +usb2_dev_get_pipe(struct usb2_device *udev, + uint8_t iface_index, uint8_t ep_index, uint8_t dir) { - struct usb2_device *udev; struct usb2_pipe *pipe; - struct usb2_fifo *f; - uint8_t ep_index; uint8_t ep_dir; - udev = ploc->udev; - ep_index = ploc->ep_index; - if (fflags & FREAD) { - f = ploc->rxfifo; - } else if (fflags & FWRITE) { - f = ploc->txfifo; - } else { - /* nothing to do */ - return; - } - - if (f) { - /* nothing do to - we already have a FIFO */ - DPRINTF(1, "has FIFO\n"); - return; - } - if (ep_index >= 16) { - /* nothing to do - these are virtual endpoints */ - DPRINTF(1, "VEP\n"); - return; - } - /* automatically create a generic endpoint */ if (ep_index == 0) { pipe = &(udev->default_pipe); } else { - if (fflags & FREAD) { + if (dir == USB_FIFO_RX) { if (udev->flags.usb2_mode == USB_MODE_HOST) { ep_dir = UE_DIR_IN; } else { @@ -556,53 +713,26 @@ } } pipe = usb2_get_pipe_by_addr(udev, ep_index | ep_dir); - if (pipe == NULL) { - /* if the pipe does not exist then return */ - return; - } - if (pipe->edesc == NULL) { - /* invalid pipe */ - return; - } - if (pipe->iface_index != ploc->iface_index) { + } + + if (pipe == NULL) { + /* if the pipe does not exist then return */ + return (NULL); + } + if (pipe->edesc == NULL) { + /* invalid pipe */ + return (NULL); + } + if (ep_index != 0) { + if (pipe->iface_index != iface_index) { /* * Permissions violation - trying to access a * pipe that does not belong to the interface. */ - return; + return (NULL); } } - if (fflags & FREAD) { - f = usb2_fifo_alloc((2 * ep_index) + USB_FIFO_RX); - } else { - f = usb2_fifo_alloc((2 * ep_index) + USB_FIFO_TX); - } - if (f == NULL) { - /* could not create FIFO */ - return; - } - /* update some fields */ - f->priv_mtx = udev->default_mtx; - f->priv_sc0 = pipe; - f->unit = 0; - f->methods = &usb2_ugen_methods; - f->iface_index = ploc->iface_index; - f->udev = udev; - - /* check the methods */ - usb2_fifo_check_methods(f->methods); - - /* register our FIFO */ - mtx_lock(&usb2_ref_lock); - if (fflags & FREAD) { - udev->fifo[(2 * ep_index) + USB_FIFO_RX] = f; - } else { - udev->fifo[(2 * ep_index) + USB_FIFO_TX] = f; - } - mtx_unlock(&usb2_ref_lock); - - /* we are done */ - return; + return (pipe); /* success */ } /*------------------------------------------------------------------------* @@ -662,7 +792,9 @@ f->async_p = NULL; /* set which file we belong to */ + mtx_lock(&usb2_ref_lock); f->curr_file = fp; + mtx_unlock(&usb2_ref_lock); /* reset queue */ usb2_fifo_reset(f); @@ -841,16 +973,7 @@ mtx_lock(loc.udev->default_mtx); /* scan down the permissions tree */ - - if ((fflags & FWRITE) && (loc.txfifo != NULL) && - (loc.txfifo->iface_index != loc.iface_index)) { - /* the FIFO does not belong to the specified interface */ - err = EPERM; - } else if ((fflags & FREAD) && (loc.rxfifo != NULL) && - (loc.rxfifo->iface_index != loc.iface_index)) { - /* the FIFO does not belong to the specified interface */ - err = EPERM; - } else if ((loc.ep_index != 0) && loc.iface && + if ((loc.ep_index != 0) && loc.iface && usb2_match_perm(&perm, &loc.iface->perm)) { /* we got access through the interface */ err = 0; @@ -875,18 +998,15 @@ usb2_unref_device(&loc); return (err); } - usb2_fifo_check(&loc, fflags & FREAD); - usb2_fifo_check(&loc, fflags & FWRITE); - usb2_unref_device(&loc); - - /* try to refer the device and associated FIFOs again */ - err = usb2_ref_device(NULL, &loc, devloc); + /* create FIFOs, if any */ + err = usb2_fifo_create(&loc, &devloc, fflags); + /* check for error */ if (err) { - return (ENXIO); + usb2_unref_device(&loc); + return (err); } if (fflags & FREAD) { - err = usb2_fifo_open(loc.rxfifo, fp, td, - fflags); + err = usb2_fifo_open(loc.rxfifo, fp, td, fflags); if (err) { DPRINTF(1, "read open failed\n"); usb2_unref_device(&loc); @@ -894,8 +1014,7 @@ } } if (fflags & FWRITE) { - err = usb2_fifo_open(loc.txfifo, fp, td, - fflags); + err = usb2_fifo_open(loc.txfifo, fp, td, fflags); if (err) { DPRINTF(1, "write open failed\n"); if (fflags & FREAD) { @@ -911,7 +1030,7 @@ * directly and don't have to create another device: */ fp->f_ops = &usb2_ops_f; - fp->f_data = ((uint8_t *)0) + loc.devloc; + fp->f_data = ((uint8_t *)0) + devloc; usb2_unref_device(&loc); @@ -968,6 +1087,8 @@ usb2_dev_init(void *arg) { mtx_init(&usb2_ref_lock, "USB ref mutex", NULL, MTX_DEF); + /* check the UGEN methods */ + usb2_fifo_check_methods(&usb2_ugen_methods); return; } @@ -1623,24 +1744,32 @@ if (pm == NULL) return (EINVAL); + /* check the methods */ + usb2_fifo_check_methods(pm); + if (priv_mtx == NULL) priv_mtx = &Giant; /* search for a free FIFO slot */ - - for (n = USB_EP_MAX;; n += 2) { + for (n = 0;; n += 2) { if (n == USB_FIFO_MAX) { + /* end of FIFOs reached */ return (ENOMEM); } - if ((udev->fifo[n + USB_FIFO_TX] == NULL) && - (udev->fifo[n + USB_FIFO_RX] == NULL)) { - break; + /* Check for TX FIFO */ + if (udev->fifo[n + USB_FIFO_TX] != NULL) { + continue; + } + /* Check for RX FIFO */ + if (udev->fifo[n + USB_FIFO_RX] != NULL) { + continue; } + break; } - f_tx = usb2_fifo_alloc(n + USB_FIFO_TX); /* write FIFO */ - f_rx = usb2_fifo_alloc(n + USB_FIFO_RX); /* read FIFO */ + f_tx = usb2_fifo_alloc(); + f_rx = usb2_fifo_alloc(); if ((f_tx == NULL) || (f_rx == NULL)) { usb2_fifo_free(f_tx); @@ -1649,29 +1778,30 @@ } /* initialise FIFO structures */ + f_tx->fifo_index = n + USB_FIFO_TX; + f_tx->dev_ep_index = (n / 2) + (USB_EP_MAX / 2); f_tx->priv_mtx = priv_mtx; f_tx->priv_sc0 = priv_sc; - f_tx->unit = unit; + f_tx->methods = pm; f_tx->iface_index = iface_index; - f_tx->methods = pm; f_tx->udev = udev; + f_tx->flag_no_uref = 1; + f_rx->fifo_index = n + USB_FIFO_RX; + f_rx->dev_ep_index = (n / 2) + (USB_EP_MAX / 2); f_rx->priv_mtx = priv_mtx; f_rx->priv_sc0 = priv_sc; - f_rx->unit = unit; + f_rx->methods = pm; f_rx->iface_index = iface_index; - f_rx->methods = pm; f_rx->udev = udev; - - /* check the methods */ - usb2_fifo_check_methods(pm); + f_rx->flag_no_uref = 1; f_sc->fp[USB_FIFO_TX] = f_tx; f_sc->fp[USB_FIFO_RX] = f_rx; mtx_lock(&usb2_ref_lock); - udev->fifo[n + USB_FIFO_TX] = f_tx; - udev->fifo[n + USB_FIFO_RX] = f_rx; + udev->fifo[f_tx->fifo_index] = f_tx; + udev->fifo[f_rx->fifo_index] = f_rx; mtx_unlock(&usb2_ref_lock); if (snprintf(src, sizeof(src), @@ -1679,7 +1809,7 @@ device_get_unit(udev->bus->bdev), udev->device_index, iface_index, - n / 2)) { + f_tx->dev_ep_index)) { /* ignore */ } for (n = 0; n != 4; n++) { ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#6 (text+ko) ==== @@ -83,8 +83,9 @@ void *queue_data; uint32_t timeout; /* timeout in milliseconds */ uint32_t bufsize; /* BULK and INTERRUPT buffer size */ - uint16_t unit; uint16_t nframes; /* for isochronous mode */ + uint16_t dev_ep_index; /* our device endpoint index */ + uint8_t flag_no_uref; /* set if FIFO is not control endpoint */ uint8_t flag_sleeping; /* set if FIFO is sleeping */ uint8_t flag_iserror; /* set if FIFO error happened */ uint8_t flag_isselect; /* set if FIFO is selected */ ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#9 (text+ko) ==== @@ -575,7 +575,7 @@ { DPRINTF(1, "index %u\n", index); - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* not the control endpoint - just forget it */ return (EINVAL); } @@ -604,7 +604,7 @@ { DPRINTF(1, "%u, %u\n", iface_index, alt_index); - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* not the control endpoint - just forget it */ return (EINVAL); } @@ -640,7 +640,7 @@ DPRINTF(5, "\n"); - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -689,7 +689,7 @@ uint16_t size = sizeof(f->udev->bus->scratch[0].data); int error; - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -735,7 +735,7 @@ uint8_t i; uint8_t max; - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -802,7 +802,7 @@ uint8_t isread; void *data = NULL; - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -883,7 +883,7 @@ struct usb2_device *udev = f->udev; int error; - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { /* control endpoint only */ return (EINVAL); } @@ -1122,7 +1122,7 @@ int error; DPRINTF(5, "cmd=%08lx\n", cmd); - if (f->fifo_index >= 2) { + if (f->flag_no_uref) { mtx_lock(f->priv_mtx); error = ugen_iface_ioctl(f, cmd, addr); mtx_unlock(f->priv_mtx); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#11 (text+ko) ==== @@ -585,6 +585,10 @@ parm->err = USB_ERR_INVAL; goto done; } + /* initialize max frame count */ + + xfer->max_frame_count = xfer->nframes; + /* initialize frame buffers */ if (parm->buf) { @@ -614,6 +618,7 @@ xfer->max_packet_size = 1; xfer->max_data_length = 0; xfer->nframes = 0; + xfer->max_frame_count = 0; } return; } From owner-p4-projects@FreeBSD.ORG Mon Jul 7 15:58:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B1091065670; Mon, 7 Jul 2008 15:58:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C31BA1065680; Mon, 7 Jul 2008 15:58:50 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from smtpoutm.mac.com (smtpoutm.mac.com [17.148.16.74]) by mx1.freebsd.org (Postfix) with ESMTP id 8D40E8FC1A; Mon, 7 Jul 2008 15:58:50 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from asmtp017-bge351000.mac.com (asmtp017-bge351000 [10.150.69.80]) by smtpoutm.mac.com (Xserve/smtpout011/MantshX 4.0) with ESMTP id m67Fwonx026618; Mon, 7 Jul 2008 08:58:50 -0700 (PDT) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=US-ASCII; format=flowed Received: from macbook-pro.jnpr.net (natint3.juniper.net [66.129.224.36]) by asmtp017.mac.com (Sun Java(tm) System Messaging Server 6.3-6.03 (built Mar 14 2008; 32bit)) with ESMTPSA id <0K3N00H288E1EDA0@asmtp017.mac.com>; Mon, 07 Jul 2008 08:58:50 -0700 (PDT) Sender: xcllnt@mac.com Message-id: <42CDD177-3EA8-4C87-9A70-1A2F4F1EB42D@mac.com> From: Marcel Moolenaar To: Takahashi Yoshihiro In-reply-to: <20080707.174208.94913728.nyan@jp.FreeBSD.org> Date: Mon, 07 Jul 2008 08:58:48 -0700 References: <200807051943.m65JhHZ6066371@repoman.freebsd.org> <20080706.110943.226722229.nyan@jp.FreeBSD.org> <20080707.174208.94913728.nyan@jp.FreeBSD.org> X-Mailer: Apple Mail (2.926) Cc: marcel@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 144741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 15:58:51 -0000 On Jul 7, 2008, at 1:42 AM, Takahashi Yoshihiro wrote: > In article > Marcel Moolenaar writes: > >>> These are wrong. RSA98-III is based on ns8250 and has extended FIFO >>> buffer. So I think that the uart_rsa_class should be added. >> >> Oh. In your patch you define it as i8251. I only refactored >> the code. Also, the ns8250 class already supports extended >> FIFOs, so we don't need a separate class for that. I'll >> change it... > > No. My code set sc_class to uart_rsa_class. It's your mistake. Ah yes, you're right. > And then I found another problem in uart_bus_isa.c. In your code > non-PnP devices for pc98 cannot probe. My original code was no > problem... Could you be a bit more specific? -- Marcel Moolenaar xcllnt@mac.com From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:09:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67C59106569B; Mon, 7 Jul 2008 17:09: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 2DB5C1065694 for ; Mon, 7 Jul 2008 17:09:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B0DC8FC13 for ; Mon, 7 Jul 2008 17:09:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67H9Sj8073713 for ; Mon, 7 Jul 2008 17:09:28 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67H9Suj073711 for perforce@freebsd.org; Mon, 7 Jul 2008 17:09:28 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 17:09:28 GMT Message-Id: <200807071709.m67H9Suj073711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 17:09:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=144831 Change 144831 by trasz@trasz_traszkan on 2008/07/07 17:09:06 Update TODO. Note that granularity stuff is not yet commited into p4. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#6 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#6 (text+ko) ==== @@ -4,9 +4,35 @@ - Add the ability to add ACE at a given position in ACL to setfacl(1), +- Add the ability to parse and print ACLs in verbose form, e.g. instead of + + owner@:rwx:f:allow + + it would be + + owner@:read_data/write_data/execute:file_inherit:allow + - Add error checking to acl_to_text_nfs4.c. -- Make access control more granular. +- Make access control more granular. The following are done: + + ACL_READ_DATA + ACL_EXECUTE + ACL_READ_ATTRIBUTES + ACL_WRITE_ATTRIBUTES + ACL_READ_NAMED_ATTRS (implemented, #ifdefed out for SunOS compatibility) + ACL_WRITE_NAMED_ATTRS (implemented, #ifdefed out for SunOS compatibility) + ACL_READ_ACL + ACL_WRITE_ACL + ACL_WRITE_OWNER + ACL_SYNCHRONIZE (not used) + + The following are left: + + ACL_WRITE_DATA + ACL_APPEND_DATA + ACL_DELETE_CHILD + ACL_DELETE - Attach ZFS to the framework. From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:15:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE62B1065679; Mon, 7 Jul 2008 17:15:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71DDC106568D for ; Mon, 7 Jul 2008 17:15:35 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EA418FC1C for ; Mon, 7 Jul 2008 17:15:35 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HFZCL074233 for ; Mon, 7 Jul 2008 17:15:35 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HFZOo074231 for perforce@freebsd.org; Mon, 7 Jul 2008 17:15:35 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 17:15:35 GMT Message-Id: <200807071715.m67HFZOo074231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 17:15:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=144832 Change 144832 by trasz@trasz_traszkan on 2008/07/07 17:15:10 Add support for printing out ACLs in verbose form. Useful, if you're not sure if 'R' is read_attribute or read_xattr, for example. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#9 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#7 (text+ko) ==== @@ -4,7 +4,7 @@ - Add the ability to add ACE at a given position in ACL to setfacl(1), -- Add the ability to parse and print ACLs in verbose form, e.g. instead of +- Add the ability to parse ACLs in verbose form, e.g. instead of owner@:rwx:f:allow ==== //depot/projects/soc2008/trasz_nfs4acl/bin/getfacl/getfacl.c#6 (text+ko) ==== @@ -54,7 +54,7 @@ usage(void) { - fprintf(stderr, "getfacl [-dhq] [file ...]\n"); + fprintf(stderr, "getfacl [-dhqv] [file ...]\n"); } static char * @@ -175,7 +175,7 @@ } static int -print_acl(char *path, acl_type_t type, int hflag, int qflag) +print_acl(char *path, acl_type_t type, int hflag, int qflag, int vflag) { struct stat sb; acl_t acl; @@ -222,7 +222,7 @@ } } - acl_text = acl_to_text(acl, 0); + acl_text = acl_to_text_np(acl, 0, vflag); if (!acl_text) { warn("%s", path); return(-1); @@ -237,7 +237,7 @@ } static int -print_acl_from_stdin(acl_type_t type, int hflag, int qflag) +print_acl_from_stdin(acl_type_t type, int hflag, int qflag, int vflag) { char *p, pathname[PATH_MAX]; int carried_error = 0; @@ -245,7 +245,7 @@ while (fgets(pathname, (int)sizeof(pathname), stdin)) { if ((p = strchr(pathname, '\n')) != NULL) *p = '\0'; - if (print_acl(pathname, type, hflag, qflag) == -1) { + if (print_acl(pathname, type, hflag, qflag, vflag) == -1) { carried_error = -1; } } @@ -259,11 +259,12 @@ acl_type_t type = ACL_TYPE_ACCESS; int carried_error = 0; int ch, error, i; - int hflag, qflag; + int hflag, qflag, vflag; hflag = 0; qflag = 0; - while ((ch = getopt(argc, argv, "dhq")) != -1) + vflag = 0; + while ((ch = getopt(argc, argv, "dhqv")) != -1) switch(ch) { case 'd': type = ACL_TYPE_DEFAULT; @@ -274,6 +275,9 @@ case 'q': qflag = 1; break; + case 'v': + vflag = 1; + break; default: usage(); return(-1); @@ -282,17 +286,17 @@ argv += optind; if (argc == 0) { - error = print_acl_from_stdin(type, hflag, qflag); + error = print_acl_from_stdin(type, hflag, qflag, vflag); return(error ? 1 : 0); } for (i = 0; i < argc; i++) { if (!strcmp(argv[i], "-")) { - error = print_acl_from_stdin(type, hflag, qflag); + error = print_acl_from_stdin(type, hflag, qflag, vflag); if (error == -1) carried_error = -1; } else { - error = print_acl(argv[i], type, hflag, qflag); + error = print_acl(argv[i], type, hflag, qflag, vflag); if (error == -1) carried_error = -1; } ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/Symbol.map#5 (text) ==== @@ -48,6 +48,7 @@ acl_set_qualifier; acl_set_tag_type; acl_to_text; + acl_to_text_np; acl_valid; acl_valid_file_np; acl_valid_link_np; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text.c#3 (text+ko) ==== @@ -51,7 +51,7 @@ * a non-POSIX.1e semantics ACL. */ -char *_nfs4_acl_to_text(const acl_t acl, ssize_t *len_p); +char *_nfs4_acl_to_text_np(const acl_t acl, ssize_t *len_p, int verbose); static char * _posix1e_acl_to_text(acl_t acl, ssize_t *len_p) @@ -240,11 +240,17 @@ } char * -acl_to_text(acl_t acl, ssize_t *len_p) +acl_to_text_np(acl_t acl, ssize_t *len_p, int verbose) { if (_acl_is_nfs4(acl)) - return (_nfs4_acl_to_text(acl, len_p)); + return (_nfs4_acl_to_text_np(acl, len_p, verbose)); return (_posix1e_acl_to_text(acl, len_p)); } +char * +acl_to_text(acl_t acl, ssize_t *len_p) +{ + return (acl_to_text_np(acl, len_p, 0)); +} + ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_to_text_nfs4.c#3 (text+ko) ==== @@ -132,7 +132,7 @@ } static int -format_entry_compact(char *str, size_t size, const acl_entry_t entry) +format_entry(char *str, size_t size, const acl_entry_t entry, int verbose) { size_t off = 0, maximum_who_field_length = 18; acl_permset_t permset; @@ -152,9 +152,9 @@ off += add_padding(str, size - off, maximum_who_field_length - off); off += snprintf(str + off, size - off, ":"); - off += _nfs4_format_access_mask(str + off, size - off, *permset, 0); + off += _nfs4_format_access_mask(str + off, size - off, *permset, verbose); off += snprintf(str + off, size - off, ":"); - off += _nfs4_format_flags(str + off, size - off, *flagset, 0); + off += _nfs4_format_flags(str + off, size - off, *flagset, verbose); off += snprintf(str + off, size - off, ":"); off += format_extended(str + off, size - off, entry); @@ -165,7 +165,7 @@ } char * -_nfs4_acl_to_text(const acl_t aclp, ssize_t *len_p) +_nfs4_acl_to_text_np(const acl_t aclp, ssize_t *len_p, int verbose) { int off = 0, size, entry_id = ACL_FIRST_ENTRY; char *str; @@ -184,7 +184,7 @@ assert(off < size); - off += format_entry_compact(str + off, size - off, entry); + off += format_entry(str + off, size - off, entry, verbose); off += snprintf(str + off, size - off, "\n"); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#9 (text+ko) ==== @@ -344,6 +344,7 @@ int acl_set_tag_type(acl_entry_t _entry_d, acl_tag_t _tag_type); ssize_t acl_size(acl_t _acl); char *acl_to_text(acl_t _acl, ssize_t *_len_p); +char *acl_to_text_np(acl_t _acl, ssize_t *_len_p, int _verbose); int acl_valid(acl_t _acl); int acl_valid_fd_np(int _fd, acl_type_t _type, acl_t _acl); int acl_valid_file_np(const char *_path_p, acl_type_t _type, acl_t _acl); From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:29:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43BEE1065670; Mon, 7 Jul 2008 17:29: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 06E3E1065671 for ; Mon, 7 Jul 2008 17:29:50 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E88878FC16 for ; Mon, 7 Jul 2008 17:29:49 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HTnMW075595 for ; Mon, 7 Jul 2008 17:29:49 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HTnQc075593 for perforce@freebsd.org; Mon, 7 Jul 2008 17:29:49 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 17:29:49 GMT Message-Id: <200807071729.m67HTnQc075593@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144834 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 17:29:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=144834 Change 144834 by trasz@trasz_traszkan on 2008/07/07 17:29:01 Update TODO. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#8 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#8 (text+ko) ==== @@ -12,8 +12,16 @@ owner@:read_data/write_data/execute:file_inherit:allow +- Update getfacl(1) and setfacl(1) manual pages. + - Add error checking to acl_to_text_nfs4.c. +- Either add or extend existing manual pages for new API routines: + acl_add_flag_np, acl_clear_flags_np, acl_create_entry_np, acl_delete_entry_np, + acl_delete_flag_np, acl_get_extended_np, acl_get_flag_np, acl_get_flagset_np, + acl_set_extended_np, acl_set_flagset_np, acl_to_text_np, acl_is_trivial_np, + acl_strip_np. + - Make access control more granular. The following are done: ACL_READ_DATA From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:31:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6E98106568C; Mon, 7 Jul 2008 17:31: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 7B4731065674 for ; Mon, 7 Jul 2008 17:31:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68CC68FC2A for ; Mon, 7 Jul 2008 17:31:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HVqYq075838 for ; Mon, 7 Jul 2008 17:31:52 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HVqaS075836 for perforce@freebsd.org; Mon, 7 Jul 2008 17:31:52 GMT (envelope-from trasz@freebsd.org) Date: Mon, 7 Jul 2008 17:31:52 GMT Message-Id: <200807071731.m67HVqaS075836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 144836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 17:31:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=144836 Change 144836 by trasz@trasz_traszkan on 2008/07/07 17:31:45 Remove declaration of acl_compute_trivial_np(), it was never implemented. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#10 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#10 (text+ko) ==== @@ -350,7 +350,6 @@ int acl_valid_file_np(const char *_path_p, acl_type_t _type, acl_t _acl); int acl_valid_link_np(const char *_path_p, acl_type_t _type, acl_t _acl); int acl_is_trivial_np(const acl_t _acl); -acl_t acl_compute_trivial_np(const acl_t _acl); acl_t acl_strip_np(const acl_t _acl, int recalculate_mask); __END_DECLS From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:53:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AB88106567E; Mon, 7 Jul 2008 17:53: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 E1219106564A for ; Mon, 7 Jul 2008 17:53:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CCB578FC22 for ; Mon, 7 Jul 2008 17:53:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HrExG077741 for ; Mon, 7 Jul 2008 17:53:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HrDsO077739 for perforce@freebsd.org; Mon, 7 Jul 2008 17:53:13 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Jul 2008 17:53:13 GMT Message-Id: <200807071753.m67HrDsO077739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 144839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 17:53:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=144839 Change 144839 by sam@sam_ebb on 2008/07/07 17:52:24 IFC @ 144838 Affected files ... .. //depot/projects/vap/Makefile.inc1#13 integrate .. //depot/projects/vap/ObsoleteFiles.inc#13 integrate .. //depot/projects/vap/UPDATING#14 integrate .. //depot/projects/vap/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/vap/etc/devd.conf#5 integrate .. //depot/projects/vap/etc/periodic/security/800.loginfail#3 integrate .. //depot/projects/vap/etc/rc.d/ipfw#4 integrate .. //depot/projects/vap/etc/rc.d/lockd#5 integrate .. //depot/projects/vap/etc/rc.d/mountcritlocal#5 integrate .. //depot/projects/vap/etc/rc.d/nfsclient#3 integrate .. //depot/projects/vap/etc/rc.d/savecore#5 integrate .. //depot/projects/vap/etc/rc.d/statd#5 integrate .. //depot/projects/vap/etc/rc.d/syscons#3 integrate .. //depot/projects/vap/games/fortune/datfiles/fortunes#10 integrate .. //depot/projects/vap/gnu/lib/Makefile#3 integrate .. //depot/projects/vap/gnu/lib/csu/Makefile#4 integrate .. //depot/projects/vap/gnu/lib/libssp/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/cvs/contrib/Makefile#5 integrate .. //depot/projects/vap/lib/csu/Makefile.inc#1 branch .. //depot/projects/vap/lib/libarchive/archive.h#2 integrate .. //depot/projects/vap/lib/libarchive/archive_read_support_format_zip.c#7 integrate .. //depot/projects/vap/lib/libarchive/archive_write_disk.c#10 integrate .. //depot/projects/vap/lib/libarchive/config_freebsd.h#7 integrate .. //depot/projects/vap/lib/libarchive/test/Makefile#10 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_gtar_1.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_compat_zip_1.zip.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_pax_filename_encoding.tar.gz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tgz.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu#2 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.c#4 integrate .. //depot/projects/vap/lib/libarchive/test/test_read_format_zip.zip.uu#1 branch .. //depot/projects/vap/lib/libc/Makefile#3 integrate .. //depot/projects/vap/lib/libc/amd64/gen/_setjmp.S#3 integrate .. //depot/projects/vap/lib/libc/amd64/gen/setjmp.S#3 integrate .. //depot/projects/vap/lib/libc/gen/glob.c#3 integrate .. //depot/projects/vap/lib/libc/i386/gen/_setjmp.S#3 integrate .. //depot/projects/vap/lib/libc/i386/gen/setjmp.S#3 integrate .. //depot/projects/vap/lib/libc/net/getaddrinfo.3#3 integrate .. //depot/projects/vap/lib/libc/stdio/Makefile.inc#4 integrate .. //depot/projects/vap/lib/libc/stdio/printf-pos.c#1 branch .. //depot/projects/vap/lib/libc/stdio/printflocal.h#1 branch .. //depot/projects/vap/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/vap/lib/libc/stdio/vfwprintf.c#5 integrate .. //depot/projects/vap/lib/libc/stdlib/hcreate.3#3 integrate .. //depot/projects/vap/lib/libc/stdlib/hcreate.c#3 integrate .. //depot/projects/vap/lib/libc/stdlib/system.3#3 integrate .. //depot/projects/vap/lib/libc/sys/mkdir.2#5 integrate .. //depot/projects/vap/lib/libc/sys/socket.2#3 integrate .. //depot/projects/vap/lib/libstand/Makefile#4 integrate .. //depot/projects/vap/lib/libthr/Makefile#7 integrate .. //depot/projects/vap/lib/libthr/thread/thr_mutex.c#9 integrate .. //depot/projects/vap/lib/libthr/thread/thr_umtx.c#5 integrate .. //depot/projects/vap/lib/libthr/thread/thr_umtx.h#5 integrate .. //depot/projects/vap/lib/libutil/Makefile#4 integrate .. //depot/projects/vap/lib/libutil/expand_number.c#3 integrate .. //depot/projects/vap/lib/libutil/hexdump.3#1 branch .. //depot/projects/vap/lib/libutil/hexdump.c#1 branch .. //depot/projects/vap/lib/libutil/libutil.h#4 integrate .. //depot/projects/vap/lib/msun/man/cos.3#4 integrate .. //depot/projects/vap/libexec/rtld-elf/Makefile#3 integrate .. //depot/projects/vap/release/Makefile#5 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/vap/release/picobsd/build/picobsd#3 integrate .. //depot/projects/vap/release/scripts/src-install.sh#3 integrate .. //depot/projects/vap/rescue/librescue/Makefile#3 integrate .. //depot/projects/vap/rescue/rescue/Makefile#6 integrate .. //depot/projects/vap/sbin/Makefile#5 integrate .. //depot/projects/vap/sbin/atacontrol/atacontrol.8#4 integrate .. //depot/projects/vap/sbin/devfs/devfs.8#3 integrate .. //depot/projects/vap/sbin/dhclient/dhclient.c#8 integrate .. //depot/projects/vap/sbin/geom/Makefile#5 integrate .. //depot/projects/vap/sbin/ggate/ggated/ggated.c#4 integrate .. //depot/projects/vap/sbin/quotacheck/preen.c#4 integrate .. //depot/projects/vap/sbin/quotacheck/quotacheck.c#5 integrate .. //depot/projects/vap/sbin/sconfig/sconfig.c#4 integrate .. //depot/projects/vap/secure/usr.bin/bdes/bdes.ps#3 integrate .. //depot/projects/vap/share/man/man4/Makefile#15 integrate .. //depot/projects/vap/share/man/man4/aac.4#4 integrate .. //depot/projects/vap/share/man/man4/bpf.4#5 integrate .. //depot/projects/vap/share/man/man4/cnw.4#4 delete .. //depot/projects/vap/share/man/man4/ed.4#6 integrate .. //depot/projects/vap/share/man/man4/malo.4#5 integrate .. //depot/projects/vap/share/man/man4/man4.i386/Makefile#3 integrate .. //depot/projects/vap/share/man/man4/man4.i386/arl.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/oltr.4#3 delete .. //depot/projects/vap/share/man/man4/man4.i386/sbni.4#3 delete .. //depot/projects/vap/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/vap/share/man/man4/man4.powerpc/bm.4#1 branch .. //depot/projects/vap/share/man/man4/sbsh.4#3 delete .. //depot/projects/vap/share/man/man4/snd_emu10kx.4#4 integrate .. //depot/projects/vap/share/man/man4/uftdi.4#3 integrate .. //depot/projects/vap/share/man/man5/src.conf.5#8 integrate .. //depot/projects/vap/share/misc/committers-doc.dot#7 integrate .. //depot/projects/vap/share/misc/committers-ports.dot#7 integrate .. //depot/projects/vap/share/misc/committers-src.dot#7 integrate .. //depot/projects/vap/share/mk/bsd.cpu.mk#6 integrate .. //depot/projects/vap/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.c#4 integrate .. //depot/projects/vap/sys/amd64/amd64/bpf_jit_machdep.h#4 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/vap/sys/amd64/amd64/pmap.c#20 integrate .. //depot/projects/vap/sys/amd64/include/iodev.h#3 integrate .. //depot/projects/vap/sys/amd64/include/memdev.h#3 integrate .. //depot/projects/vap/sys/amd64/include/pmap.h#7 integrate .. //depot/projects/vap/sys/amd64/include/vmparam.h#7 integrate .. //depot/projects/vap/sys/arm/include/memdev.h#3 integrate .. //depot/projects/vap/sys/boot/Makefile.inc#1 branch .. //depot/projects/vap/sys/boot/arm/Makefile.inc#1 branch .. //depot/projects/vap/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/vap/sys/boot/efi/Makefile.inc#3 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/vap/sys/boot/i386/Makefile.inc#6 integrate .. //depot/projects/vap/sys/boot/i386/boot2/boot2.c#6 integrate .. //depot/projects/vap/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/vap/sys/boot/ia64/Makefile.inc#3 integrate .. //depot/projects/vap/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/vap/sys/boot/ia64/efi/Makefile#5 integrate .. //depot/projects/vap/sys/boot/ia64/ski/Makefile#5 integrate .. //depot/projects/vap/sys/boot/ofw/Makefile.inc#1 branch .. //depot/projects/vap/sys/boot/pc98/Makefile.inc#5 integrate .. //depot/projects/vap/sys/boot/pc98/boot2/Makefile#6 integrate .. //depot/projects/vap/sys/boot/pc98/boot2/README.serial.98#3 delete .. //depot/projects/vap/sys/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/vap/sys/boot/powerpc/Makefile.inc#1 branch .. //depot/projects/vap/sys/boot/powerpc/ofw/Makefile#4 integrate .. //depot/projects/vap/sys/boot/sparc64/Makefile.inc#3 integrate .. //depot/projects/vap/sys/boot/sparc64/loader/Makefile#5 integrate .. //depot/projects/vap/sys/boot/uboot/Makefile.inc#1 branch .. //depot/projects/vap/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/vap/sys/compat/pecoff/imgact_pecoff.c#8 delete .. //depot/projects/vap/sys/compat/pecoff/imgact_pecoff.h#3 delete .. //depot/projects/vap/sys/compat/svr4/svr4_stat.c#6 integrate .. //depot/projects/vap/sys/conf/NOTES#23 integrate .. //depot/projects/vap/sys/conf/files.i386#13 integrate .. //depot/projects/vap/sys/conf/files.pc98#12 integrate .. //depot/projects/vap/sys/conf/kern.mk#8 integrate .. //depot/projects/vap/sys/conf/kern.post.mk#8 integrate .. //depot/projects/vap/sys/contrib/dev/oltr/COPYRIGHT#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr.c#6 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr_isa.c#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltr_pci.c#5 delete .. //depot/projects/vap/sys/contrib/dev/oltr/if_oltrvar.h#5 delete .. //depot/projects/vap/sys/contrib/dev/oltr/trlld.h#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/trlldbm.c#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/trlldhm.c#3 delete .. //depot/projects/vap/sys/contrib/dev/oltr/trlldmac.c#3 delete .. //depot/projects/vap/sys/dev/aac/aac.c#12 integrate .. //depot/projects/vap/sys/dev/aac/aac_pci.c#8 integrate .. //depot/projects/vap/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/vap/sys/dev/arl/if_arl.c#5 delete .. //depot/projects/vap/sys/dev/arl/if_arl_isa.c#5 delete .. //depot/projects/vap/sys/dev/arl/if_arlreg.h#5 delete .. //depot/projects/vap/sys/dev/bm/if_bm.c#2 integrate .. //depot/projects/vap/sys/dev/bm/if_bmreg.h#2 integrate .. //depot/projects/vap/sys/dev/bm/if_bmvar.h#2 integrate .. //depot/projects/vap/sys/dev/ce/ceddk.h#3 integrate .. //depot/projects/vap/sys/dev/ce/if_ce.c#3 integrate .. //depot/projects/vap/sys/dev/cnw/if_cnw.c#6 delete .. //depot/projects/vap/sys/dev/cnw/if_cnwioctl.h#3 delete .. //depot/projects/vap/sys/dev/cnw/if_cnwreg.h#3 delete .. //depot/projects/vap/sys/dev/cp/cpddk.h#3 integrate .. //depot/projects/vap/sys/dev/cp/if_cp.c#6 integrate .. //depot/projects/vap/sys/dev/ctau/ctddk.h#3 integrate .. //depot/projects/vap/sys/dev/ctau/if_ct.c#6 integrate .. //depot/projects/vap/sys/dev/cx/cxddk.h#3 integrate .. //depot/projects/vap/sys/dev/cx/if_cx.c#5 integrate .. //depot/projects/vap/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/vap/sys/dev/io/iodev.c#3 integrate .. //depot/projects/vap/sys/dev/k8temp/k8temp.c#6 integrate .. //depot/projects/vap/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/vap/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/vap/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/vap/sys/dev/mii/rgephy.c#6 integrate .. //depot/projects/vap/sys/dev/mii/rgephyreg.h#5 integrate .. //depot/projects/vap/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/vap/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/vap/sys/dev/pccard/pccarddevs#7 integrate .. //depot/projects/vap/sys/dev/re/if_re.c#12 integrate .. //depot/projects/vap/sys/dev/sbni/if_sbni.c#5 delete .. //depot/projects/vap/sys/dev/sbni/if_sbni_isa.c#5 delete .. //depot/projects/vap/sys/dev/sbni/if_sbni_pci.c#5 delete .. //depot/projects/vap/sys/dev/sbni/if_sbnireg.h#3 delete .. //depot/projects/vap/sys/dev/sbni/if_sbnivar.h#5 delete .. //depot/projects/vap/sys/dev/sbsh/if_sbsh.c#6 delete .. //depot/projects/vap/sys/dev/sbsh/if_sbshreg.h#3 delete .. //depot/projects/vap/sys/dev/sound/pci/atiixp.h#3 integrate .. //depot/projects/vap/sys/dev/syscons/daemon/daemon_saver.c#6 integrate .. //depot/projects/vap/sys/dev/usb/usb_ethersubr.c#6 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/vap/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/vap/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#10 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/vap/sys/geom/virstor/g_virstor.c#3 integrate .. //depot/projects/vap/sys/i386/conf/NOTES#13 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.c#4 integrate .. //depot/projects/vap/sys/i386/i386/bpf_jit_machdep.h#4 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/vap/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate .. //depot/projects/vap/sys/i386/include/iodev.h#3 integrate .. //depot/projects/vap/sys/i386/include/memdev.h#3 integrate .. //depot/projects/vap/sys/ia64/ia64/machdep.c#16 integrate .. //depot/projects/vap/sys/ia64/include/ia64_cpu.h#5 integrate .. //depot/projects/vap/sys/ia64/include/memdev.h#3 integrate .. //depot/projects/vap/sys/kern/kern_alq.c#8 integrate .. //depot/projects/vap/sys/kern/kern_cpuset.c#8 integrate .. //depot/projects/vap/sys/kern/kern_descrip.c#16 integrate .. //depot/projects/vap/sys/kern/kern_event.c#10 integrate .. //depot/projects/vap/sys/kern/kern_fork.c#9 integrate .. //depot/projects/vap/sys/kern/kern_intr.c#12 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#11 integrate .. //depot/projects/vap/sys/kern/kern_lockf.c#10 integrate .. //depot/projects/vap/sys/kern/kern_malloc.c#9 integrate .. //depot/projects/vap/sys/kern/kern_mib.c#9 integrate .. //depot/projects/vap/sys/kern/kern_poll.c#7 integrate .. //depot/projects/vap/sys/kern/kern_umtx.c#10 integrate .. //depot/projects/vap/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/vap/sys/kern/stack_protector.c#1 branch .. //depot/projects/vap/sys/kern/subr_param.c#7 integrate .. //depot/projects/vap/sys/kern/uipc_debug.c#4 integrate .. //depot/projects/vap/sys/kern/uipc_sem.c#10 integrate .. //depot/projects/vap/sys/kern/uipc_shm.c#5 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/vap/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/vap/sys/mips/adm5120/adm5120_machdep.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/adm5120reg.h#1 branch .. //depot/projects/vap/sys/mips/adm5120/admpci.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/console.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/files.adm5120#1 branch .. //depot/projects/vap/sys/mips/adm5120/if_admsw.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/if_admswreg.h#1 branch .. //depot/projects/vap/sys/mips/adm5120/if_admswvar.h#1 branch .. //depot/projects/vap/sys/mips/adm5120/obio.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/adm5120/std.adm5120#1 branch .. //depot/projects/vap/sys/mips/adm5120/uart_bus_adm5120.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/uart_cpu_adm5120.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/uart_dev_adm5120.c#1 branch .. //depot/projects/vap/sys/mips/adm5120/uart_dev_adm5120.h#1 branch .. //depot/projects/vap/sys/mips/idt/files.idt#1 branch .. //depot/projects/vap/sys/mips/idt/idt_machdep.c#1 branch .. //depot/projects/vap/sys/mips/idt/idtpci.c#1 branch .. //depot/projects/vap/sys/mips/idt/idtreg.h#1 branch .. //depot/projects/vap/sys/mips/idt/if_kr.c#1 branch .. //depot/projects/vap/sys/mips/idt/if_krreg.h#1 branch .. //depot/projects/vap/sys/mips/idt/obio.c#1 branch .. //depot/projects/vap/sys/mips/idt/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/idt/std.idt#1 branch .. //depot/projects/vap/sys/mips/idt/uart_bus_rc32434.c#1 branch .. //depot/projects/vap/sys/mips/idt/uart_cpu_rc32434.c#1 branch .. //depot/projects/vap/sys/mips/include/iodev.h#2 integrate .. //depot/projects/vap/sys/mips/include/memdev.h#2 integrate .. //depot/projects/vap/sys/mips/malta/files.malta#1 branch .. //depot/projects/vap/sys/mips/malta/gt.c#1 branch .. //depot/projects/vap/sys/mips/malta/gt_pci.c#1 branch .. //depot/projects/vap/sys/mips/malta/gtreg.h#1 branch .. //depot/projects/vap/sys/mips/malta/gtvar.h#1 branch .. //depot/projects/vap/sys/mips/malta/malta_machdep.c#1 branch .. //depot/projects/vap/sys/mips/malta/maltareg.h#1 branch .. //depot/projects/vap/sys/mips/malta/obio.c#1 branch .. //depot/projects/vap/sys/mips/malta/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/malta/std.malta#1 branch .. //depot/projects/vap/sys/mips/malta/uart_bus_maltausart.c#1 branch .. //depot/projects/vap/sys/mips/malta/uart_cpu_maltausart.c#1 branch .. //depot/projects/vap/sys/mips/malta/yamon.c#1 branch .. //depot/projects/vap/sys/mips/malta/yamon.h#1 branch .. //depot/projects/vap/sys/mips/mips/pmap.c#5 integrate .. //depot/projects/vap/sys/mips/mips32/adm5120/adm5120_machdep.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/adm5120reg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/admpci.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/console.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/files.adm5120#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/if_admsw.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/if_admswreg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/if_admswvar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/obio.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/obiovar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/std.adm5120#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_bus_adm5120.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_dev_adm5120.c#2 delete .. //depot/projects/vap/sys/mips/mips32/adm5120/uart_dev_adm5120.h#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/files.idt#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/idt_machdep.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/idtpci.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/idtreg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/if_kr.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/if_krreg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/obio.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/obiovar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/std.idt#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/uart_bus_rc32434.c#2 delete .. //depot/projects/vap/sys/mips/mips32/idt/uart_cpu_rc32434.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/files.malta#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/gt.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/gt_pci.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/gtreg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/gtvar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/malta_machdep.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/maltareg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/obio.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/obiovar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/std.malta#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/uart_bus_maltausart.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/uart_cpu_maltausart.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/yamon.c#2 delete .. //depot/projects/vap/sys/mips/mips32/malta/yamon.h#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/files.sentry5#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/obio.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/obiovar.h#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/s5_machdep.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/s5reg.h#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/siba_cc.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/siba_mips.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/siba_sdram.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/uart_bus_sbusart.c#2 delete .. //depot/projects/vap/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#2 delete .. //depot/projects/vap/sys/mips/sentry5/files.sentry5#1 branch .. //depot/projects/vap/sys/mips/sentry5/obio.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/obiovar.h#1 branch .. //depot/projects/vap/sys/mips/sentry5/s5_machdep.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/s5reg.h#1 branch .. //depot/projects/vap/sys/mips/sentry5/siba_cc.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/siba_mips.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/siba_sdram.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/uart_bus_sbusart.c#1 branch .. //depot/projects/vap/sys/mips/sentry5/uart_cpu_sbusart.c#1 branch .. //depot/projects/vap/sys/modules/Makefile#33 integrate .. //depot/projects/vap/sys/modules/arl/Makefile#6 delete .. //depot/projects/vap/sys/modules/cnw/Makefile#2 delete .. //depot/projects/vap/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/vap/sys/modules/oltr/Makefile#4 delete .. //depot/projects/vap/sys/modules/pecoff/Makefile#5 delete .. //depot/projects/vap/sys/modules/ralfw/Makefile#6 integrate .. //depot/projects/vap/sys/modules/sbni/Makefile#3 delete .. //depot/projects/vap/sys/modules/sbsh/Makefile#3 delete .. //depot/projects/vap/sys/modules/sem/Makefile#5 integrate .. //depot/projects/vap/sys/net/bpf.c#16 integrate .. //depot/projects/vap/sys/net/bpf.h#7 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.c#5 integrate .. //depot/projects/vap/sys/net/bpf_zerocopy.h#3 integrate .. //depot/projects/vap/sys/net/if.c#14 integrate .. //depot/projects/vap/sys/net/if_bridge.c#5 integrate .. //depot/projects/vap/sys/net/if_gre.c#9 integrate .. //depot/projects/vap/sys/net/if_lagg.c#5 integrate .. //depot/projects/vap/sys/net/if_loop.c#10 integrate .. //depot/projects/vap/sys/net/if_ppp.c#6 integrate .. //depot/projects/vap/sys/net/if_var.h#10 integrate .. //depot/projects/vap/sys/net/netisr.c#6 integrate .. //depot/projects/vap/sys/net/netisr.h#4 integrate .. //depot/projects/vap/sys/net/raw_cb.c#7 integrate .. //depot/projects/vap/sys/net/raw_cb.h#3 integrate .. //depot/projects/vap/sys/net/raw_usrreq.c#5 integrate .. //depot/projects/vap/sys/net/rtsock.c#9 integrate .. //depot/projects/vap/sys/net80211/ieee80211_ht.c#24 integrate .. //depot/projects/vap/sys/net80211/ieee80211_output.c#52 integrate .. //depot/projects/vap/sys/netatalk/ddp_usrreq.c#6 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#9 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#19 integrate .. //depot/projects/vap/sys/netinet/if_ether.c#8 integrate .. //depot/projects/vap/sys/netinet/in.c#7 integrate .. //depot/projects/vap/sys/netinet/ip_gre.c#5 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#9 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#8 integrate .. //depot/projects/vap/sys/netinet6/frag6.c#6 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6.c#9 integrate .. //depot/projects/vap/sys/netinet6/in6_ifattach.c#8 integrate .. //depot/projects/vap/sys/netinet6/in6_rmx.c#7 integrate .. //depot/projects/vap/sys/netinet6/ip6_forward.c#6 integrate .. //depot/projects/vap/sys/netinet6/ip6_input.c#8 integrate .. //depot/projects/vap/sys/netinet6/ip6_ipsec.c#5 integrate .. //depot/projects/vap/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/vap/sys/netipsec/key.c#8 integrate .. //depot/projects/vap/sys/netipx/ipx_input.c#6 integrate .. //depot/projects/vap/sys/netnatm/natm_proto.c#6 integrate .. //depot/projects/vap/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/vap/sys/nfsclient/nfs.h#6 integrate .. //depot/projects/vap/sys/nfsclient/nfs_node.c#8 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/vap/sys/nfsclient/nfsmount.h#5 integrate .. //depot/projects/vap/sys/nfsclient/nfsnode.h#8 integrate .. //depot/projects/vap/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/vap/sys/nlm/nlm.h#2 integrate .. //depot/projects/vap/sys/nlm/nlm_advlock.c#1 branch .. //depot/projects/vap/sys/nlm/nlm_prot.h#2 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_clnt.c#2 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_impl.c#6 integrate .. //depot/projects/vap/sys/nlm/nlm_prot_server.c#2 integrate .. //depot/projects/vap/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/vap/sys/pc98/include/bus.h#5 integrate .. //depot/projects/vap/sys/pc98/pc98/busiosubr.c#3 integrate .. //depot/projects/vap/sys/pci/if_rlreg.h#11 integrate .. //depot/projects/vap/sys/powerpc/include/memdev.h#3 integrate .. //depot/projects/vap/sys/rpc/auth_unix.c#2 integrate .. //depot/projects/vap/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/vap/sys/rpc/clnt.h#2 integrate .. //depot/projects/vap/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/vap/sys/rpc/clnt_rc.c#3 integrate .. //depot/projects/vap/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/vap/sys/rpc/rpcb_clnt.c#2 integrate .. //depot/projects/vap/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/vap/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/vap/sys/security/mac/mac_policy.h#7 integrate .. //depot/projects/vap/sys/security/mac/mac_posix_sem.c#5 integrate .. //depot/projects/vap/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/vap/sys/security/mac_mls/mac_mls.c#9 integrate .. //depot/projects/vap/sys/security/mac_stub/mac_stub.c#9 integrate .. //depot/projects/vap/sys/security/mac_test/mac_test.c#9 integrate .. //depot/projects/vap/sys/sparc64/include/in_cksum.h#5 integrate .. //depot/projects/vap/sys/sparc64/include/memdev.h#3 integrate .. //depot/projects/vap/sys/sparc64/sparc64/in_cksum.c#3 integrate .. //depot/projects/vap/sys/sun4v/include/in_cksum.h#3 integrate .. //depot/projects/vap/sys/sun4v/include/memdev.h#3 integrate .. //depot/projects/vap/sys/sys/event.h#7 integrate .. //depot/projects/vap/sys/sys/fcntl.h#6 integrate .. //depot/projects/vap/sys/sys/file.h#8 integrate .. //depot/projects/vap/sys/sys/kernel.h#11 integrate .. //depot/projects/vap/sys/sys/ksem.h#3 integrate .. //depot/projects/vap/sys/sys/lockf.h#8 integrate .. //depot/projects/vap/sys/sys/param.h#24 integrate .. //depot/projects/vap/sys/sys/priv.h#6 integrate .. //depot/projects/vap/sys/sys/semaphore.h#3 integrate .. //depot/projects/vap/sys/sys/socketvar.h#11 integrate .. //depot/projects/vap/sys/sys/umtx.h#8 integrate .. //depot/projects/vap/sys/sys/user.h#10 integrate .. //depot/projects/vap/sys/vm/vm_kern.h#5 integrate .. //depot/projects/vap/tools/build/options/WITHOUT_SSP#3 integrate .. //depot/projects/vap/tools/regression/file/flock/flock.c#2 integrate .. //depot/projects/vap/tools/regression/lib/libc/stdio/Makefile#3 integrate .. //depot/projects/vap/tools/regression/lib/libc/stdio/test-print-positional.c#1 branch .. //depot/projects/vap/tools/regression/lib/msun/Makefile#7 integrate .. //depot/projects/vap/tools/regression/lib/msun/test-fmaxmin.c#1 branch .. //depot/projects/vap/tools/regression/lib/msun/test-fmaxmin.t#1 branch .. //depot/projects/vap/tools/regression/posixsem/Makefile#1 branch .. //depot/projects/vap/tools/regression/posixsem/posixsem.c#1 branch .. //depot/projects/vap/tools/regression/posixsem/posixsem.t#1 branch .. //depot/projects/vap/tools/regression/posixsem/test.c#1 branch .. //depot/projects/vap/tools/regression/posixsem/test.h#1 branch .. //depot/projects/vap/tools/regression/posixshm/test.c#2 integrate .. //depot/projects/vap/usr.bin/cpio/Makefile#3 integrate .. //depot/projects/vap/usr.bin/cpio/config_freebsd.h#2 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.c#3 integrate .. //depot/projects/vap/usr.bin/gzip/gzip.1#3 integrate .. //depot/projects/vap/usr.bin/gzip/unbzip2.c#3 integrate .. //depot/projects/vap/usr.bin/gzip/znew#4 integrate .. //depot/projects/vap/usr.bin/ldd/ldd.1#4 integrate .. //depot/projects/vap/usr.bin/ldd/ldd.c#3 integrate .. //depot/projects/vap/usr.bin/make/make.1#6 integrate .. //depot/projects/vap/usr.bin/procstat/procstat_files.c#4 integrate .. //depot/projects/vap/usr.bin/su/su.1#3 integrate .. //depot/projects/vap/usr.bin/tar/Makefile#7 integrate .. //depot/projects/vap/usr.bin/tar/bsdtar.h#7 integrate .. //depot/projects/vap/usr.bin/tar/config_freebsd.h#6 integrate .. //depot/projects/vap/usr.bin/tar/read.c#7 integrate .. //depot/projects/vap/usr.bin/tar/write.c#8 integrate .. //depot/projects/vap/usr.bin/unzip/unzip.1#2 integrate .. //depot/projects/vap/usr.bin/unzip/unzip.c#2 integrate .. //depot/projects/vap/usr.sbin/Makefile#9 integrate .. //depot/projects/vap/usr.sbin/arlcontrol/Makefile#3 delete .. //depot/projects/vap/usr.sbin/arlcontrol/arlcontrol.8#3 delete .. //depot/projects/vap/usr.sbin/arlcontrol/arlcontrol.c#3 delete .. //depot/projects/vap/usr.sbin/config/mkmakefile.c#5 integrate .. //depot/projects/vap/usr.sbin/cron/cron/cron.8#3 integrate .. //depot/projects/vap/usr.sbin/cron/cron/cron.c#3 integrate .. //depot/projects/vap/usr.sbin/cron/cron/cron.h#3 integrate .. //depot/projects/vap/usr.sbin/cron/cron/do_command.c#3 integrate .. //depot/projects/vap/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/vap/usr.sbin/mountd/exports.5#3 integrate .. //depot/projects/vap/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate .. //depot/projects/vap/usr.sbin/ngctl/main.c#3 integrate .. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.8#4 integrate .. //depot/projects/vap/usr.sbin/pmcstat/pmcstat.c#4 integrate .. //depot/projects/vap/usr.sbin/quot/quot.c#3 integrate .. //depot/projects/vap/usr.sbin/quotaon/quotaon.c#3 integrate .. //depot/projects/vap/usr.sbin/repquota/repquota.c#3 integrate .. //depot/projects/vap/usr.sbin/rpc.lockd/lockd.c#7 integrate .. //depot/projects/vap/usr.sbin/rpc.statd/file.c#3 integrate .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Makefile#6 integrate .. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/vap/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.606 2008/06/18 13:52:58 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.607 2008/06/25 21:33:28 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -225,6 +225,7 @@ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ + -DWITHOUT_SSP \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF @@ -235,7 +236,7 @@ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \ - -DNO_WARNS -DNO_CTF + -DNO_WARNS -DNO_CTF -DWITHOUT_SSP # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -452,7 +453,7 @@ .if ${MK_KERBEROS} != "no" .for _t in obj depend all cd ${.CURDIR}/kerberos5/tools; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= ${_t} + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= ${_t} .endfor .endif .for _t in obj includes @@ -474,7 +475,7 @@ .endfor .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools + MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} -DWITHOUT_SSP DESTDIR= build-tools .endfor cd ${.CURDIR}; \ ${LIB32WMAKE} -f Makefile.inc1 libraries @@ -760,14 +761,14 @@ @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) .for target in obj depend all cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} -DNO_CPU_CFLAGS -DNO_CTF ${target} + ${MAKE} -DWITHOUT_SSP -DNO_CPU_CFLAGS -DNO_CTF ${target} .endfor .endif .if !defined(NO_KERNELDEPEND) ==== //depot/projects/vap/ObsoleteFiles.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.143 2008/06/14 10:42:18 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.151 2008/07/06 20:57:35 marcel 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,49 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080706: bsdlabel(8) removed on powerpc +.if ${TARGET_ARCH} == "powerpc" +OLD_FILES+=sbin/bsdlabel +OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz +.endif +# 20080704: sbsh(4) removed +OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz +OLD_FILES+=usr/share/man/man4/sbsh.4.gz +# 20080704: sbni(4) removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/if_sbni.4.gz +OLD_FILES+=usr/share/man/man4/i386/sbni.4.gz +.endif +# 20080704: cnw(4) removed +OLD_FILES+=usr/share/man/man4/if_cnw.4.gz +OLD_FILES+=usr/share/man/man4/cnw.4.gz +# 20080704: oltr(4) removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz +OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz +.endif +# 20080704: arl(4) removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/sbin/arlcontrol +OLD_FILES+=usr/share/man/man4/i386/arl.4.gz +OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz +.endif +# 20080703: sunlabel only for sparc64 +.if ${TARGET_ARCH} != "sparc64" +OLD_FILES+=sbin/sunlabel +OLD_FILES+=usr/share/man/man8/sunlabel.8.gz +.endif +# 20080703: bsdlabel & fdisk removed on ia64 +.if ${TARGET_ARCH} == "ia64" +OLD_FILES+=sbin/bsdlabel +OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz +OLD_FILES+=usr/share/man/man8/disklabel.8.gz +OLD_FILES+=sbin/fdisk +OLD_FILES+=usr/share/man/man8/fdisk.8.gz +.endif +# 20080701: wpa_supplicant.conf moved to share/examples/etc/ +OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf +OLD_DIRS+=usr/share/examples/wpa_supplicant # 20080614: sgtty removed OLD_FILES+=usr/include/sys/ttychars.h OLD_FILES+=usr/include/sys/ttydev.h ==== //depot/projects/vap/UPDATING#14 (text+ko) ==== @@ -413,6 +413,20 @@ This does not affect those who are using "/dev/dsp". 20061122: + geom(4)'s gmirror(8) class metadata structure has been + rev'd from v3 to v4. If you update across this point and + your metadata is converted for you, you will not be easily + able to downgrade since the /boot/kernel.old/geom_mirror.ko + kernel module will be unable to read the v4 metadata. You + can resolve this by doing from the loader(8) prompt: + + set vfs.root.mountfrom="ufs:/dev/XXX" + + where XXX is the root slice of one of the disks that composed + the mirror (i.e.: /dev/ad0s1a). You can then rebuild + the array the same way you built it originally. + +20061122: The following binaries have been disconnected from the build: mount_devfs, mount_ext2fs, mount_fdescfs, mount_procfs, mount_linprocfs, and mount_std. The functionality of these programs has been @@ -1053,4 +1067,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.532 2008/06/09 21:33:57 marcel Exp $ +$FreeBSD: src/UPDATING,v 1.534 2008/07/07 13:08:30 remko Exp $ ==== //depot/projects/vap/bin/setfacl/setfacl.1#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.17 2006/09/17 17:40:07 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.19 2008/07/06 22:47:10 csjp Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -234,9 +234,27 @@ .Pp Multiple ACL entries specified on the command line are separated by commas. +.Pp +It is possible for files and directories to inherit ACL entries from their +parent directory. +This is accomplished through the use of the default ACL. +It should be noted that before you can specify a default ACL, the mandatory +ACL entries for user, group, other and mask must be set. +For more details see the examples below. +Default ACLs can be created by using +.Fl d . .Sh EXIT STATUS .Ex -std .Sh EXAMPLES +.Dl setfacl -d -m u::rwx,g::rx,o::rx,mask::rwx dir +.Dl setfacl -d -m g:admins:rwx dir +.Pp +The first command sets the mandatory elements of the default ACL. +The second command specifies that users in group admins can have read, write, and execute +permissions for directory named "dir". +It should be noted that any files or directories created underneath "dir" will +inherit these default ACLs upon creation. +.Pp .Dl setfacl -m u::rwx,g:mail:rw file .Pp Sets read, write, and execute permissions for the ==== //depot/projects/vap/contrib/gcc/config/i386/freebsd.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.73 2007/05/19 02:30:20 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.75 2008/06/28 15:28:17 obrien Exp $ */ #undef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" @@ -54,7 +54,7 @@ /* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h but trashed by config//. */ -#undef STARTFILE_SPEC +#undef STARTFILE_SPEC #define STARTFILE_SPEC FBSD_STARTFILE_SPEC /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. */ @@ -78,13 +78,13 @@ #undef WCHAR_TYPE_SIZE #define WCHAR_TYPE_SIZE (TARGET_64BIT ? 32 : BITS_PER_WORD) -#undef SUBTARGET_EXTRA_SPECS /* i386.h bogusly defines it. */ +#undef SUBTARGET_EXTRA_SPECS /* i386.h bogusly defines it. */ #define SUBTARGET_EXTRA_SPECS \ { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER } #define TARGET_VERSION fprintf (stderr, " (i386 FreeBSD/ELF)"); -#define TARGET_ELF 1 +#define TARGET_ELF 1 /* This goes away when the math emulator is fixed. */ #undef TARGET_SUBTARGET_DEFAULT @@ -101,7 +101,7 @@ /* FreeBSD sets the rounding precision of the FPU to 53 bits. Let the compiler get the contents of and std::numeric_limits correct. */ -#undef TARGET_96_ROUND_53_LONG_DOUBLE +#undef TARGET_96_ROUND_53_LONG_DOUBLE #define TARGET_96_ROUND_53_LONG_DOUBLE (!TARGET_64BIT) /* Tell final.c that we don't need a label passed to mcount. */ @@ -110,7 +110,7 @@ /* Output assembler code to FILE to begin profiling of the current function. LABELNO is an optional label. */ -#undef MCOUNT_NAME +#undef MCOUNT_NAME #define MCOUNT_NAME ".mcount" /* Output assembler code to FILE to end profiling of the current function. */ @@ -145,7 +145,7 @@ else \ fprintf ((FILE), "%s", xname); \ } \ - else \ + else \ { \ if (xname[0] == '%') \ xname += 2; \ @@ -191,7 +191,7 @@ uninitialized global data will be output in the data section if `-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be used. */ -#undef BSS_SECTION_ASM_OP +#undef BSS_SECTION_ASM_OP #define BSS_SECTION_ASM_OP "\t.section\t.bss" /* Like `ASM_OUTPUT_BSS' except takes the required alignment as a @@ -202,7 +202,7 @@ Try to use function `asm_output_aligned_bss' defined in file `varasm.c' when defining this macro. */ -#undef ASM_OUTPUT_ALIGNED_BSS +#undef ASM_OUTPUT_ALIGNED_BSS #define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) @@ -230,7 +230,7 @@ assemble_name (asm_out_file, NAME); \ fputc ('-', asm_out_file); \ assemble_name (asm_out_file, \ - XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \ + XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0)); \ fprintf (asm_out_file, "\n"); \ } while (0) ==== //depot/projects/vap/etc/devd.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.41 2008/06/15 13:26:25 kmacy Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.42 2008/06/27 12:04:36 rpaulo Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -255,6 +255,28 @@ action "/etc/rc.resume acpi $notify"; }; +# The next blocks enable volume hotkeys that can be found on the Asus EeePC +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x13"; + action "mixer 0"; +}; + +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x14"; + action "mixer vol -10"; +}; + +notify 0 { + match "system" "ACPI"; + match "subsystem" "ASUS-Eee"; + match "notify" "0x15"; + action "mixer vol +10"; +}; + /* EXAMPLES TO END OF FILE # The following might be an example of something that a vendor might ==== //depot/projects/vap/etc/periodic/security/800.loginfail#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $ +# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.9 2008/06/30 08:01:47 mtm Exp $ # # Show login failures @@ -59,7 +59,7 @@ [Yy][Ee][Ss]) echo "" echo "${host} login failures:" - n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" | + n=$(catmsgs | egrep -ia "^$yesterday.*: .*(fail|invalid|bad|illegal)" | tee /dev/stderr | wc -l) [ $n -gt 0 ] && rc=1 || rc=0;; *) rc=0;; ==== //depot/projects/vap/etc/rc.d/ipfw#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.17 2008/01/27 15:15:12 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.18 2008/07/05 15:27:39 mtm Exp $ # # PROVIDE: ipfw @@ -51,7 +51,9 @@ # Enable the firewall # - ${SYSCTL_W} net.inet.ip.fw.enable=1 + if ! ${SYSCTL_W} net.inet.ip.fw.enable=1 1>/dev/null 2>&1; then + warn "failed to enable firewall" + fi } ipfw_stop() ==== //depot/projects/vap/etc/rc.d/lockd#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.20 2008/06/23 04:05:39 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.21 2008/06/27 15:45:17 mtm Exp $ # # PROVIDE: lockd @@ -15,7 +15,7 @@ rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" start_precmd='lockd_precmd' -stop_precmd='checkyesno nfs_server_enable || checkyesno nfsclient_enable' +stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable' status_precmd=$stop_precmd # Make sure that we are either an NFS client or server, and that we get @@ -26,7 +26,7 @@ local ret ret=0 - if ! checkyesno nfs_server_enable && ! checkyesno nfsclient_enable + if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable then ret=1 fi ==== //depot/projects/vap/etc/rc.d/mountcritlocal#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.16 2008/03/06 14:39:33 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.17 2008/07/05 15:19:58 mtm Exp $ # # PROVIDE: mountcritlocal @@ -28,7 +28,7 @@ esac # Mount everything except nfs filesystems. - echo -n 'Mounting local file systems:' + [ -z "${rc_quiet}" ] && echo -n 'Mounting local file systems:' mount_excludes='no' for i in ${netfs_types}; do fstype=${i%:*} @@ -37,7 +37,7 @@ mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} err=$? - echo '.' + [ -z "${rc_quiet}" ] && echo '.' case ${err} in 0) ==== //depot/projects/vap/etc/rc.d/nfsclient#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/nfsclient,v 1.7 2008/07/05 15:13:21 mtm Exp $ # # PROVIDE: nfsclient @@ -22,11 +22,15 @@ # if [ -n "${nfs_access_cache}" ]; then - echo "NFS access cache time=${nfs_access_cache}" - sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null + [ -z "${rc_quiet}" ] && echo "NFS access cache time=${nfs_access_cache}" + if ! sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null; then + warn "failed to set access cache timeout" + fi fi if [ -n "${nfs_bufpackets}" ]; then - sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null + if ! sysctl vfs.nfs.bufpackets=${nfs_bufpackets} > /dev/null; then + warn "failed to set vfs.nfs.bufpackets" + fi fi unmount_all ==== //depot/projects/vap/etc/rc.d/savecore#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/savecore,v 1.13 2008/06/23 20:54:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.15 2008/07/06 08:31:29 mtm Exp $ # # PROVIDE: savecore @@ -17,11 +17,6 @@ savecore_prestart() { - # ${DUMPDIR} should be a directory or a symbolic link - # to the crash directory if core dumps are to be saved. - # - DUMPDIR="${dumpdir:-/var/crash}" - # Quit if we have no dump device case ${dumpdev} in [Nn][Oo] | '') @@ -57,8 +52,19 @@ savecore_start() { - if savecore -C >/dev/null; then - savecore ${savecore_flags} ${DUMPDIR} ${dumpdev} + local dev + + case "${dumpdev}" in + [Aa][Uu][Tt][Oo]) + dev= + ;; + *) + dev="${dumpdev}" + ;; + esac + + if savecore -C "${dumpdir}" "${dev}" >/dev/null; then + savecore ${savecore_flags} ${dumpdir} ${dumpdev} else [ -z "${rc_quiet}" ] && echo "No core dumps found" fi ==== //depot/projects/vap/etc/rc.d/statd#5 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 7 17:55:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EDB01065673; Mon, 7 Jul 2008 17:55:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52EDB106566C for ; Mon, 7 Jul 2008 17:55:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 407CB8FC16 for ; Mon, 7 Jul 2008 17:55:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67HtGO6077947 for ; Mon, 7 Jul 2008 17:55:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67HtGGY077945 for perforce@freebsd.org; Mon, 7 Jul 2008 17:55:16 GMT (envelope-from sam@freebsd.org) Date: Mon, 7 Jul 2008 17:55:16 GMT Message-Id: <200807071755.m67HtGGY077945@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 144840 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 17:55:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=144840 Change 144840 by sam@sam_ebb on 2008/07/07 17:54:39 IFC @ 144838 Affected files ... .. //depot/projects/vap/sys/conf/files#44 integrate .. //depot/projects/vap/sys/conf/kern.pre.mk#9 integrate Differences ... ==== //depot/projects/vap/sys/conf/files#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1310 2008/06/20 19:28:33 delphij Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1314 2008/07/04 21:24:35 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -514,7 +514,6 @@ dev/cm/smc90cx6.c optional cm dev/cmx/cmx.c optional cmx dev/cmx/cmx_pccard.c optional cmx pccard -dev/cnw/if_cnw.c optional cnw pccard dev/cpufreq/ichss.c optional cpufreq dev/cs/if_cs.c optional cs dev/cs/if_cs_isa.c optional cs isa @@ -1093,7 +1092,6 @@ dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci dev/safe/safe.c optional safe -dev/sbsh/if_sbsh.c optional sbsh dev/scc/scc_if.m optional scc dev/scc/scc_bfe_ebus.c optional scc ebus dev/scc/scc_bfe_quicc.c optional scc quicc @@ -1618,6 +1616,8 @@ kern/sched_4bsd.c optional sched_4bsd kern/sched_ule.c optional sched_ule kern/serdev_if.m standard +kern/stack_protector.c standard \ + compile-with "${NORMAL_C:N-fstack-protector*}" kern/subr_acl_posix1e.c standard kern/subr_autoconf.c standard kern/subr_blist.c standard @@ -2067,6 +2067,7 @@ nfsserver/nfs_srvcache.c optional nfsserver nfsserver/nfs_srvsubs.c optional nfsserver nfsserver/nfs_syscalls.c optional nfsserver +nlm/nlm_advlock.c optional nfslockd nlm/nlm_prot_clnt.c optional nfslockd nlm/nlm_prot_impl.c optional nfslockd nlm/nlm_prot_server.c optional nfslockd ==== //depot/projects/vap/sys/conf/kern.pre.mk#9 (text+ko) ==== @@ -1,12 +1,9 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.99 2008/06/09 06:31:17 jb Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.100 2008/06/25 21:33:28 ru Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. -SRCCONF?= /etc/src.conf -.if exists(${SRCCONF}) -.include "${SRCCONF}" -.endif +.include # Can be overridden by makeoptions or /etc/make.conf KERNEL_KO?= kernel From owner-p4-projects@FreeBSD.ORG Mon Jul 7 18:55:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0645D1065673; Mon, 7 Jul 2008 18:55: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 BE5D91065671 for ; Mon, 7 Jul 2008 18:55:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC3D88FC19 for ; Mon, 7 Jul 2008 18:55:17 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67ItH9U084709 for ; Mon, 7 Jul 2008 18:55:17 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67ItHQp084707 for perforce@freebsd.org; Mon, 7 Jul 2008 18:55:17 GMT (envelope-from marcel@freebsd.org) Date: Mon, 7 Jul 2008 18:55:17 GMT Message-Id: <200807071855.m67ItHQp084707@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 144842 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 18:55:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=144842 Change 144842 by marcel@marcel_xcllnt on 2008/07/07 18:55:11 ISA_PNP_PROBE() can also return ENOENT. So, assume a match when the error is 0, not != ENXIO. Affected files ... .. //depot/projects/uart/dev/uart/uart_bus_isa.c#13 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_bus_isa.c#13 (text+ko) ==== @@ -170,7 +170,7 @@ sc = device_get_softc(dev); /* Probe PnP _and_ non-PnP ns8250 here. */ - if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) != ENXIO) { + if (ISA_PNP_PROBE(parent, dev, isa_ns8250_ids) == 0) { sc->sc_class = &uart_ns8250_class; return (uart_bus_probe(dev, 0, 0, 0, 0)); } From owner-p4-projects@FreeBSD.ORG Mon Jul 7 19:53:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CCB51065676; Mon, 7 Jul 2008 19:53:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C310D1065673 for ; Mon, 7 Jul 2008 19:53:21 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 362878FC27 for ; Mon, 7 Jul 2008 19:53:16 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67JrGOE093549 for ; Mon, 7 Jul 2008 19:53:16 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67JrGhL093547 for perforce@freebsd.org; Mon, 7 Jul 2008 19:53:16 GMT (envelope-from strauss@FreeBSD.org) Date: Mon, 7 Jul 2008 19:53:16 GMT Message-Id: <200807071953.m67JrGhL093547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 144845 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 19:53:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=144845 Change 144845 by strauss@strauss_marvelman on 2008/07/07 19:52:47 Added ZIP writer, non-functional at all Affected files ... .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 7 20:25:54 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 407EB106566C; Mon, 7 Jul 2008 20:25: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 04CBB106567A for ; Mon, 7 Jul 2008 20:25:54 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E684E8FC21 for ; Mon, 7 Jul 2008 20:25:53 +0000 (UTC) (envelope-from strauss@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67KPrie097800 for ; Mon, 7 Jul 2008 20:25:53 GMT (envelope-from strauss@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67KPrsO097798 for perforce@freebsd.org; Mon, 7 Jul 2008 20:25:53 GMT (envelope-from strauss@FreeBSD.org) Date: Mon, 7 Jul 2008 20:25:53 GMT Message-Id: <200807072025.m67KPrsO097798@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to strauss@FreeBSD.org using -f From: Anselm Strauss To: Perforce Change Reviews Cc: Subject: PERFORCE change 144846 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 20:25:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=144846 Change 144846 by strauss@strauss_marvelman on 2008/07/07 20:25:22 - Now I know why to use format_octal() - Added ZIP writer to Makefile (the good thing about place holder methods is that they compile easily ;-) Affected files ... .. //depot/projects/soc2008/strauss_libarchive/Makefile.am#5 edit .. //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#2 edit Differences ... ==== //depot/projects/soc2008/strauss_libarchive/Makefile.am#5 (text+ko) ==== @@ -133,6 +133,7 @@ libarchive/archive_write_set_format_pax.c \ libarchive/archive_write_set_format_shar.c \ libarchive/archive_write_set_format_ustar.c \ + libarchive/archive_write_set_format_zip.c \ libarchive/config_freebsd.h \ libarchive/config_windows.h \ libarchive/filter_fork.c \ ==== //depot/projects/soc2008/strauss_libarchive/libarchive/archive_write_set_format_zip.c#2 (text+ko) ==== @@ -104,23 +104,23 @@ memset(&h, 0, sizeof(h)); - h.signature = 0x04034b50; - h.version = 0x0200; /* TODO: Set individually for each file entry. */ - h.flags = 0x0008; /* Flagging bit 3 for using data descriptor. */ - h.compression = 0x0000; /* No compression. */ - h.timedate = 0x0000; /* TODO: Using zero (means standard input) for now. */ + format_octal(0x04034b50, &h.signature, sizeof(h.signature)); + format_octal(0x0200, &h.version, sizeof(h.version)); /* TODO: Set individually for each file entry. */ + format_octal(8, &h.flags, sizeof(h.flags)); /* Flagging bit 3 for using data descriptor. */ + format_octal(0, &h.compression, sizeof(h.compression)); /* No compression. */ + format_octal(0, &h.timedate, sizeof(h.timedate)); /* TODO: Using zero (means standard input) for now. */ /* Next 3 fields are specified in the data descriptor after writing file data. * Can't compute them before having seen the data stream. */ - h.crc32 = h.compressed_size = h.uncompressed_size = 0x00000000; - h.filename_length = sizeof(archive_entry_pathname(entry)); - h.extra_length = 0x0000; + format_octal(0, &h.crc32, sizeof(h.crc32)); + format_octal(0, &h.compressed_size, sizeof(h.compressed_size)); + format_octal(0, &h.uncompressed_size, sizeof(h.uncompressed_size)); + format_octal(sizeof(archive_entry_pathname(entry)), &h.filename_length, sizeof(h.filename_length)); + format_octal(0x0000, &h.extra_length, sizeof(h.extra_length)); /* Not using. */ ret = (a->compressor.write)(a, &h, sizeof(h)); if (ret != ARCHIVE_OK) return (ARCHIVE_FATAL); - zip->entry_bytes_remaining = archive_entry_size(entry); - return (ret); } From owner-p4-projects@FreeBSD.ORG Mon Jul 7 22:14:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FD071065673; Mon, 7 Jul 2008 22:14:44 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A038106567D for ; Mon, 7 Jul 2008 22:14:44 +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 0737D8FC13 for ; Mon, 7 Jul 2008 22:14:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m67MEi56018170 for ; Mon, 7 Jul 2008 22:14:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m67MEhnD018168 for perforce@freebsd.org; Mon, 7 Jul 2008 22:14:43 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 7 Jul 2008 22:14:43 GMT Message-Id: <200807072214.m67MEhnD018168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 144851 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jul 2008 22:14:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=144851 Change 144851 by hselasky@hselasky_laptop001 on 2008/07/07 22:13:49 More patches to support LibUSB 1.0. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#12 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#7 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#3 edit .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#12 (text+ko) ==== @@ -77,7 +77,6 @@ static void usb2_dev_init_post(void *arg); static void usb2_dev_uninit(void *arg); static int usb2_fifo_uiomove(struct usb2_fifo *f, void *cp, int n, struct uio *uio); -static void usb2_fifo_wakeup(struct usb2_fifo *f); static void usb2_fifo_check_methods(struct usb2_fifo_methods *pm); static void usb2_clone(void *arg, USB_UCRED char *name, int namelen, struct cdev **dev); static struct usb2_fifo *usb2_fifo_alloc(void); @@ -907,21 +906,77 @@ } /*------------------------------------------------------------------------* + * usb2_check_thread_perm + * + * Returns: + * 0: Has permission. + * Else: No permission. + *------------------------------------------------------------------------*/ +int +usb2_check_thread_perm(struct usb2_device *udev, struct thread *td, + int fflags, uint8_t iface_index, uint8_t ep_index) +{ + struct usb2_perm perm; + struct usb2_interface *iface; + int err; + + iface = usb2_get_iface(udev, iface_index); + if (iface == NULL) { + return (EINVAL); + } + if (iface->idesc == NULL) { + return (EINVAL); + } + /* set default value */ + bzero(&perm, sizeof(perm)); + + /* create a permissions mask */ + perm.uid = td->td_ucred->cr_ruid; + perm.gid = td->td_ucred->cr_rgid; + perm.mode = 0; + if (fflags & FREAD) + perm.mode |= 0444; + if (fflags & FWRITE) + perm.mode |= 0222; + perm.active = 1; + + mtx_lock(udev->default_mtx); + + /* scan down the permissions tree */ + if ((ep_index != 0) && iface && + usb2_match_perm(&perm, &iface->perm)) { + /* we got access through the interface */ + err = 0; + } else if (udev && usb2_match_perm(&perm, &udev->perm)) { + /* we got access through the device */ + err = 0; + } else if (udev->bus && usb2_match_perm(&perm, &(udev->bus->perm))) { + /* we got access through the USB bus */ + err = 0; + } else if (usb2_match_perm(&perm, &usb2_perm)) { + /* we got general access */ + err = 0; + } else { + /* no access */ + err = EPERM; + } + mtx_unlock(udev->default_mtx); + return (err); +} + +/*------------------------------------------------------------------------* * usb2_fdopen - cdev callback *------------------------------------------------------------------------*/ static int usb2_fdopen(struct cdev *dev, int xxx_oflags, struct thread *td, struct file *fp) { struct usb2_location loc; - struct usb2_perm perm; uint32_t devloc; int err; int fflags; DPRINTF(1, "oflags=0x%08x\n", xxx_oflags); - bzero(&perm, sizeof(perm)); - devloc = usb2_last_devloc; usb2_last_devloc = (0 - 1); /* reset "usb2_devloc" */ @@ -960,39 +1015,9 @@ DPRINTF(1, "cannot ref device\n"); return (ENXIO); } - /* create a permissions mask */ - perm.uid = td->td_ucred->cr_ruid; - perm.gid = td->td_ucred->cr_rgid; - perm.mode = 0; - if (fflags & FREAD) - perm.mode |= 0444; - if (fflags & FWRITE) - perm.mode |= 0222; - perm.active = 1; - - mtx_lock(loc.udev->default_mtx); + err = usb2_check_thread_perm(loc.udev, td, fflags, + loc.iface_index, loc.ep_index); - /* scan down the permissions tree */ - if ((loc.ep_index != 0) && loc.iface && - usb2_match_perm(&perm, &loc.iface->perm)) { - /* we got access through the interface */ - err = 0; - } else if (loc.udev && usb2_match_perm(&perm, &loc.udev->perm)) { - /* we got access through the device */ - err = 0; - } else if (loc.bus && usb2_match_perm(&perm, &loc.bus->perm)) { - /* we got access through the USB bus */ - err = 0; - } else if (usb2_match_perm(&perm, &usb2_perm)) { - /* we got general access */ - err = 0; - } else { - /* no access */ - err = EPERM; - } - - mtx_unlock(loc.udev->default_mtx); - /* check for error */ if (err) { usb2_unref_device(&loc); @@ -1281,7 +1306,6 @@ return (ENXIO); } - /* ARGSUSED */ static int usb2_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td) @@ -1297,17 +1321,18 @@ return (POLLHUP); } fflags = fp->f_flag; - f = loc.txfifo; if ((events & (POLLOUT | POLLWRNORM)) && (fflags & FWRITE)) { + f = loc.txfifo; + mtx_lock(f->priv_mtx); /* check if any packets are available */ USB_IF_POLL(&(f->free_q), m); - if (f->flag_iserror || m) { + if (f->flag_iserror || f->flag_iscomplete || m) { revents |= events & (POLLOUT | POLLWRNORM); } else { f->flag_isselect = 1; @@ -1316,17 +1341,17 @@ mtx_unlock(f->priv_mtx); } - f = loc.rxfifo; - if ((events & (POLLIN | POLLRDNORM)) && (fflags & FREAD)) { + f = loc.rxfifo; + mtx_lock(f->priv_mtx); /* check if any packets are available */ USB_IF_POLL(&(f->used_q), m); - if (f->flag_iserror || m) { + if (f->flag_iserror || f->flag_iscomplete || m) { revents |= events & (POLLIN | POLLRDNORM); } else { f->flag_isselect = 1; @@ -1381,8 +1406,6 @@ err = EIO; goto done; } - /* XXX TODO: support IO-vectors */ - while (uio->uio_resid > 0) { USB_IF_DEQUEUE(&(f->used_q), m); @@ -1505,8 +1528,6 @@ err = EIO; goto done; } - /* XXX TODO: support IO-vectors */ - while (uio->uio_resid > 0) { USB_IF_DEQUEUE(&(f->free_q), m); @@ -1613,7 +1634,7 @@ return; } -static void +void usb2_fifo_wakeup(struct usb2_fifo *f) { usb2_fifo_signal(f); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#7 (text+ko) ==== @@ -74,8 +74,10 @@ struct usb2_fifo_methods *methods; struct cdev *symlink[2]; /* our symlinks */ struct proc *async_p; /* process that wants SIGIO */ + struct usb2_fs_endpoint *fs_ep_ptr; struct usb2_device *udev; struct usb2_xfer *xfer[2]; + struct usb2_xfer **fs_xfer; struct mtx *priv_mtx; /* client data */