From 014c3fc0c37a1503ef03f52e14cd32575db6fa14 Mon Sep 17 00:00:00 2001
From: beveloper <beveloper@nowhere.fake>
Date: Sun, 9 May 2004 17:29:39 +0000
Subject: [PATCH] Cleanup of event handling. Disable debugging.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7469 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../kernel/drivers/network/ipro1000/debug.h   | 23 +++++++++++++++----
 .../kernel/drivers/network/ipro1000/if_em.c   |  2 +-
 .../kernel/drivers/network/ipro1000/if_em.h   | 15 ++++++------
 .../drivers/network/ipro1000/if_em_osdep.h    |  2 +-
 .../kernel/drivers/network/ipro1000/util.h    |  2 ++
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/add-ons/kernel/drivers/network/ipro1000/debug.h b/src/add-ons/kernel/drivers/network/ipro1000/debug.h
index 7cfe4b11fd..405f7e4b95 100644
--- a/src/add-ons/kernel/drivers/network/ipro1000/debug.h
+++ b/src/add-ons/kernel/drivers/network/ipro1000/debug.h
@@ -21,14 +21,29 @@
 
 #include <KernelExport.h>
 
-#define DEBUG
-
 #ifdef DEBUG
+
 	#define TRACE(a...) dprintf("ipro1000: " a)
+
+	/* used by if_em.h */
+	#define DEBUG_INIT  1
+	#define DEBUG_IOCTL 1
+	#define DEBUG_HW    1
+	#define DBG_STATS	1
+
 #else
+
 	#define TRACE(a...)
-#endif
 
-#define ERROR(a...) dprintf("ipro1000: " a)
+	/* used by if_em.h */
+	#define DEBUG_INIT  0
+	#define DEBUG_IOCTL 0
+	#define DEBUG_HW    0
+	#undef DBG_STATS
+
+#endif
+
+#define ERROR(a...) dprintf("ipro1000: ERROR " a)
+#define PRINT(a...) dprintf("ipro1000: " a)
 
 #endif
diff --git a/src/add-ons/kernel/drivers/network/ipro1000/if_em.c b/src/add-ons/kernel/drivers/network/ipro1000/if_em.c
index 0a3c0ebc4c..e74ba1ba28 100644
--- a/src/add-ons/kernel/drivers/network/ipro1000/if_em.c
+++ b/src/add-ons/kernel/drivers/network/ipro1000/if_em.c
@@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /*$FreeBSD: /repoman/r/ncvs/src/sys/dev/em/if_em.c,v 1.2.2.19 2004/04/22 22:03:26 ru Exp $*/
 
 #include "if_em.h"
-
+#include "util.h"
 
 
 /*********************************************************************
diff --git a/src/add-ons/kernel/drivers/network/ipro1000/if_em.h b/src/add-ons/kernel/drivers/network/ipro1000/if_em.h
index 0bd9fc004f..ef858d25c8 100644
--- a/src/add-ons/kernel/drivers/network/ipro1000/if_em.h
+++ b/src/add-ons/kernel/drivers/network/ipro1000/if_em.h
@@ -197,9 +197,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #define ETHER_ALIGN                     2
 
 /* Defines for printing debug information */
-#define DEBUG_INIT  1
-#define DEBUG_IOCTL 1
-#define DEBUG_HW    1
 
 #define INIT_DEBUGOUT(S)            if (DEBUG_INIT)  printf("ipro1000: " S "\n")
 #define INIT_DEBUGOUT1(S, A)        if (DEBUG_INIT)  printf("ipro1000: " S "\n", A)
@@ -249,7 +246,13 @@ typedef struct _DESCRIPTOR_PAIR
     ADDRESS_LENGTH_PAIR descriptor[4];
     u_int32_t   elements;
 } DESC_ARRAY, *PDESC_ARRAY;
-  
+
+// used by interrupt and event handling thread
+enum {
+	EVENT_LINK_CHANGED 		= 0x01,
+	EVENT_RESTART_TX		= 0x02,
+};
+
 /* Our adapter structure */
 struct adapter {
 	struct arpcom   interface_data;
@@ -268,12 +271,10 @@ struct adapter {
 	int             io_rid;
 	u_int8_t        unit;
 
-	/* Even processing thread, to move link status change out of the interrupt */ 	
+	/* Event processing thread, to move link status change out of the interrupt */ 	
 	thread_id		event_thread;
 	sem_id			event_sem;
 	volatile int32	event_flags;
-	enum { EVENT_LINK_CHANGED = 0x1, EVENT_RESTART_TX = 0x02 };
-	#define atomic_read(a) atomic_or(a, 0)
 
 	/* Info about the board itself */
 	u_int32_t       part_num;
diff --git a/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h b/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h
index 0cde23151a..f7253bfeb0 100644
--- a/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h
+++ b/src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h
@@ -201,7 +201,7 @@ void *driver_malloc(int size, int p2, int p3);
 void  driver_free(void *p, int p2);
 
 /* GCC will always emit a read opcode when reading from */
-/* a volatile poitner, even if the result is unused */
+/* a volatile pointer, even if the result is unused */
 #define E1000_WRITE_FLUSH(a) \
 	E1000_READ_REG(a, STATUS)
 
diff --git a/src/add-ons/kernel/drivers/network/ipro1000/util.h b/src/add-ons/kernel/drivers/network/ipro1000/util.h
index d6e3bfd5af..f95e89d673 100644
--- a/src/add-ons/kernel/drivers/network/ipro1000/util.h
+++ b/src/add-ons/kernel/drivers/network/ipro1000/util.h
@@ -29,4 +29,6 @@ void	area_free(void *p);
 // generic macro for rounding, can only be used for power of 2 blocksize
 #define ROUNDUP(size, blocksize) 	(((size) + (blocksize) - 1) & ~((blocksize) - 1))
 
+#define atomic_read(a) atomic_or(a, 0)
+
 #endif