PERFORCE change 179600 for review

[Alexandre Fiveg]

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

Change 179600 by afiveg at cottonmouth on 2010/06/14 14:45:34

	not important fixes... next I will go to initial e1000-state  

Affected files ...

.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_em.c#3 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_em.h#3 edit
.. //depot/projects/soc2010/ringmap/current/sys/modules/em/Makefile#6 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#4 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_em.c#3 (text+ko) ====

@@ -461,6 +461,7 @@
 		else 
 			return 1;
 	} else {
+
 		ent = em_vendor_info_array;
 		while (ent->vendor_id != 0) {
 			if ((pci_vendor_id == ent->vendor_id) &&
@@ -475,10 +476,12 @@
 					em_strings[ent->index],
 					em_driver_version);
 				device_set_desc_copy(dev, adapter_name);
+				RINGMAP_FUNC_DEBUG(Supported device found!);
 				return (BUS_PROBE_DEFAULT);
 			}
 			ent++;
 		}
+		RINGMAP_FUNC_DEBUG(Probe failed!);
 	}
 #else
 	ent = em_vendor_info_array;
@@ -742,7 +745,6 @@
 	adapter->led_dev = led_create(em_led_func, adapter,
 	    device_get_nameunit(dev));
 
-	INIT_DEBUGOUT("em_attach: end");
 
 
 #ifdef __RINGMAP__
@@ -760,6 +762,7 @@
 #endif /* __RINGMAP__ */
 
 
+	INIT_DEBUGOUT("em_attach: end");
 
 	return (0);
 
@@ -2414,7 +2417,6 @@
 	device_t dev = adapter->dev;
 	int error, rid = 0;
 
-	RINGMAP_FUNC_DEBUG(start);
 
 	/* Manually turn off all interrupts */
 	E1000_WRITE_REG(&adapter->hw, E1000_IMC, 0xffffffff);
@@ -5083,7 +5085,6 @@
  **********************************************************************/
 #ifndef __RINGMAP__
 static void
-em_print_debug_info(struct adapter *adapter)
 #else
 void
 #endif

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_em.h#3 (text+ko) ====

@@ -216,7 +216,7 @@
 #define EM_MSIX_BAR		3	/* On 82575 */
 
 /* Defines for printing debug information */
-#define DEBUG_INIT  0
+#define DEBUG_INIT  1
 #define DEBUG_IOCTL 0
 #define DEBUG_HW    0
 

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

@@ -1,5 +1,5 @@
 # $FreeBSD: src/sys/modules/em/Makefile,v 1.16 2010/03/29 23:36:34 jfv Exp $
-.PATH:  ${.CURDIR}/../../dev/e1000 : ${.CURDIR}/../../net
+.PATH:  ${.CURDIR}/../../dev/e1000
 
 .if defined(KERNEL_RINGMAP)
 KMOD	= if_ringmap
@@ -12,6 +12,7 @@
 SRCS	+= $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED)
 
 .if defined(KERNEL_RINGMAP)
+.PATH:  ${.PATH} : ${.CURDIR}/../../net
 CFLAGS += -D__RINGMAP__ -D__E1000_RINGMAP__
 SRCS		+= ringmap.c
 .endif
@@ -26,7 +27,7 @@
 PCIE_SHARED = e1000_80003es2lan.c e1000_ich8lan.c e1000_82571.c e1000_82575.c
 LEGACY_SHARED = e1000_82540.c e1000_82542.c e1000_82541.c e1000_82543.c
 
-CFLAGS += -I${.CURDIR}/../../dev/e1000
+CFLAGS += -g -I${.CURDIR}/../../dev/e1000
 
 # DEVICE_POLLING for a non-interrupt-driven method
 #CFLAGS  += -DDEVICE_POLLING

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

@@ -239,7 +239,7 @@
 #endif
 
 #ifndef __RINGMAP_DEB
-#define __RINGMAP_DEB 0
+#define __RINGMAP_DEB 1
 #endif
 
 #define RINGMAP_PREFIX 	"--> RINGMAP: "