From owner-p4-projects@FreeBSD.ORG Tue Jan 18 15:58:42 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 316AF106566C; Tue, 18 Jan 2011 15:58: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 E8322106564A for ; Tue, 18 Jan 2011 15:58:41 +0000 (UTC) (envelope-from afiveg@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id D54238FC1A for ; Tue, 18 Jan 2011 15:58:41 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0IFwfv0062517 for ; Tue, 18 Jan 2011 15:58:41 GMT (envelope-from afiveg@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0IFwfKe062514 for perforce@freebsd.org; Tue, 18 Jan 2011 15:58:41 GMT (envelope-from afiveg@FreeBSD.org) Date: Tue, 18 Jan 2011 15:58:41 GMT Message-Id: <201101181558.p0IFwfKe062514@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to afiveg@FreeBSD.org using -f From: Alexandre Fiveg To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 187920 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 15:58:42 -0000 http://p4web.freebsd.org/@@187920?ac=10 Change 187920 by afiveg@cottonmouth on 2011/01/18 15:58:37 The character special device is named now as ringmap_ Affected files ... .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#57 edit .. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#56 edit Differences ... ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#57 (text+ko) ==== @@ -100,7 +100,7 @@ */ rm->cdev = make_dev(&ringmap_devsw, device_get_unit(dev), UID_ROOT, GID_WHEEL, 0666, - device_get_nameunit(dev)); + RINGMAP_DEVICE(device_get_nameunit(dev))); if (rm->cdev == NULL) { RINGMAP_ERROR(Can not create character device); FREE(rm, M_DEVBUF); ==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#56 (text+ko) ==== @@ -12,7 +12,7 @@ * Prefix for name of device (for example /dev/ringmap_em0 will full name) * currently not used, but it will! */ -#define RINGMAP_DEVICE "ringmap" +#define RINGMAP_DEVICE(iface) "ringmap_"#iface /* * Default queue number. For multiqueue. Currently not used! @@ -309,18 +309,18 @@ #define PACKET_ADDR_DEB(ring, i) \ if (__RINGMAP_DEB) { \ - printf("=+= packet.user=0x%X, packet.phys=0x%X, packet.kern=0x%X\n",\ - (unsigned int)ring->slot[i].packet.user, \ - (unsigned int)ring->slot[i].packet.phys, \ - (unsigned int)ring->slot[i].packet.kern); \ + printf("=+= packet.user=%p, packet.phys=%p, packet.kern=%p\n",\ + (void *)ring->slot[i].packet.user, \ + (void *)ring->slot[i].packet.phys, \ + (void *)ring->slot[i].packet.kern); \ }; #define PRINT_MBUF_ADDR(ring, i) \ do { \ - printf("=+= mbuf.user=0x%X, mbuf.phys=0x%llX, mbuf.kern=0x%X\n", \ - (unsigned int)ring->slot[i].mbuf.user, \ - (long long unsigned int)ring->slot[i].mbuf.phys,\ - (unsigned int)ring->slot[i].mbuf.kern); \ + printf("=+= mbuf.user=%p, mbuf.phys=%p, mbuf.kern=%p\n", \ + (void *)ring->slot[i].mbuf.user, \ + (void *)ring->slot[i].mbuf.phys, \ + (void *)ring->slot[i].mbuf.kern); \ } while (0); #define PRINT_SLOT(ring, i) \