From owner-p4-projects@FreeBSD.ORG Thu Jul 15 09:40:00 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E19E01065674; Thu, 15 Jul 2010 09:39: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 8DD8B106566C for ; Thu, 15 Jul 2010 09:39:59 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7ABF08FC1F for ; Thu, 15 Jul 2010 09:39:59 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6F9dxfJ014230 for ; Thu, 15 Jul 2010 09:39:59 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6F9dxK6014228 for perforce@freebsd.org; Thu, 15 Jul 2010 09:39:59 GMT (envelope-from afiveg@FreeBSD.org) Date: Thu, 15 Jul 2010 09:39:59 GMT Message-Id: <201007150939.o6F9dxK6014228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2010 09:40:00 -0000 http://p4web.freebsd.org/@@180983?ac=10 Change 180983 by afiveg@cottonmouth on 2010/07/15 09:39:05 cosmetic fixes Affected files ... .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#11 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#11 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#13 edit .. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#18 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#26 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#25 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#23 edit .. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#15 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#29 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#29 edit .. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#13 edit .. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#14 edit .. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#9 edit .. //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#8 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#11 (text+ko) ==== @@ -216,9 +216,6 @@ static void pcap_cleanup_zbuf(pcap_t *p) { -#ifdef RINGMAP - RINGMAP_FUNC_DEBUG(start); -#endif /* * Delete the mappings. Note that p->buffer gets initialized to one * of the mmapped regions in this case, so do not try and free it ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#11 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#13 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#18 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#26 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#25 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#23 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#15 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#29 (text+ko) ==== @@ -46,16 +46,15 @@ d_close_t ringmap_close; d_ioctl_t ringmap_ioctl; d_read_t ringmap_read; +d_mmap_single_t ringmap_mmap; -/* - * Character Device for access on if_em driver structures - */ static struct cdevsw ringmap_devsw = { .d_version = D_VERSION, .d_open = ringmap_open, .d_close = ringmap_close, .d_ioctl = ringmap_ioctl, .d_read = ringmap_read, + .d_mmap_single = ringmap_mmap, .d_name = "ringmap_cdev" }; @@ -269,6 +268,16 @@ return (0); } + +int +ringmap_mmap(struct cdev *cdev, vm_ooffset_t *offset, + vm_size_t size, struct vm_object **object, int nprot) +{ + + return (0); +} + + int ringmap_read(struct cdev *cdev, struct uio *uio, int ioflag) { ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#29 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#13 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#14 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#9 (text+ko) ==== ==== //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#8 (text+ko) ====