PERFORCE change 179469 for review

[Alexandre Fiveg]

http://p4web.freebsd.org/@@179469?ac=10

Change 179469 by afiveg at cottonmouth on 2010/06/11 15:41:24

	ringmap is in CURRENT integrated but doesn't work correctly. 
	Now, to activate ringmap, should KERNEL_RINGMAP and LIBPCAP_RINGMAP in make.conf be set. 
	Submitted by:	Alexander Fiveg

Affected files ...

.. //depot/projects/soc2010/ringmap/current/Makefile#3 edit
.. //depot/projects/soc2010/ringmap/current/sys/conf/files#3 edit
.. //depot/projects/soc2010/ringmap/current/sys/conf/options#3 edit
.. //depot/projects/soc2010/ringmap/current/sys/i386/conf/I686RINGMAP_CURRENT#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#3 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#2 edit
.. //depot/projects/soc2010/ringmap/current/usr.bin/kdump/Makefile#3 edit
.. //depot/projects/soc2010/ringmap/current/usr.bin/kdump/mkioctls#3 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/Makefile#3 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/conf/files#3 (text+ko) ====

@@ -2351,7 +2351,6 @@
 net/radix_mpath.c		standard
 net/raw_cb.c			standard
 net/raw_usrreq.c		standard
-net/ringmap.c		optional em | ixgbe
 net/route.c			standard
 net/rtsock.c			standard
 net/slcompress.c		optional netgraph_vjc | sppp | \

==== //depot/projects/soc2010/ringmap/current/sys/conf/options#3 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/i386/conf/I686RINGMAP_CURRENT#2 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#3 (text+ko) ====

@@ -11,8 +11,8 @@
 SRCS    += $(CORE_SRC) $(LEGACY_SRC)
 SRCS	+= $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED)
 
-.if defined(RINGMAP)
-CFLAGS += D__RINGMAP__
+.if defined(KERNEL_RINGMAP)
+CFLAGS += -D__RINGMAP__ -I
 SRC		+= ${.CURDIR}/../../net/ringmap.c
 .endif
 

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 extern void	em_print_debug_info(struct adapter *);
 #endif
 
-#include <net/ringmap.h>
+#include "ringmap.h"
 
 /* DON'T TOUCH IT */
 int fiveg_da_2009 = 1;

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#2 (text+ko) ====

@@ -1,5 +1,7 @@
 #ifdef __E1000_RINGMAP__
-#include "../dev/e1000/ringmap_e1000.h"
+#ifdef _KERNEL
+#include "ringmap_e1000.h"
+#endif 
 #endif
 
 /* Minimum distance to be kept between the userrp and RDT to provide a
@@ -25,6 +27,10 @@
 // #define DEV_ID 	0x105E 
 #define DEV_ID 	0
 
+#ifndef _KERNEL
+#include <machine/bus.h>
+#endif
+
 struct address {
 	bus_addr_t 	phys;
 	vm_offset_t	kern;
@@ -133,6 +139,7 @@
 
 #include <sys/ioccom.h>
 
+
 /* *************************************
  * IOCTL ' s  system calls             *
  * *************************************/

==== //depot/projects/soc2010/ringmap/current/usr.bin/kdump/Makefile#3 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/usr.bin/kdump/mkioctls#3 (text+ko) ====