patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / net / ixgb / ixgb_osdep.h

diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index 4d07e66..f1184e4 100644 (file)
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   
-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+  Copyright(c) 1999 - 2004 Intel Corporation. All rights reserved.
   
   This program is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by the Free 
@@ -23,14 +23,15 @@
   Contact Information:
   Linux NICS <linux.nics@intel.com>
   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
 *******************************************************************************/
 
-/* glue for the OS independant part of ixgb 
+/* glue for the OS independent part of ixgb
  * includes register access macros
  */
 
-#ifndef IXGB_OSDEP_H
-#define IXGB_OSDEP_H
+#ifndef _IXGB_OSDEP_H_
+#define _IXGB_OSDEP_H_
 
 #include <linux/types.h>
 #include <linux/pci.h>
@@ -39,35 +40,42 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 
-/* FIXME: eliminate me */
+#ifndef msec_delay
 #define msec_delay(x)  do { if(in_interrupt()) { \
-                               mdelay(x); \
+                               /* Don't mdelay in interrupt context! */ \
+                               BUG(); \
                        } else { \
                                set_current_state(TASK_UNINTERRUPTIBLE); \
-                               schedule_timeout((x * HZ)/1000); \
+                               schedule_timeout((x * HZ)/1000 + 2); \
                        } } while(0)
+#endif
+
+#define PCI_COMMAND_REGISTER   PCI_COMMAND
+#define CMD_MEM_WRT_INVALIDATE PCI_COMMAND_INVALIDATE
 
 typedef enum {
+#undef FALSE
        FALSE = 0,
+#undef TRUE
        TRUE = 1
 } boolean_t;
 
+#undef ASSERT
+#define ASSERT(x)      if(!(x)) BUG()
 #define MSGOUT(S, A, B)        printk(KERN_DEBUG S "\n", A, B)
 
 #if DBG
-#define ASSERT(x)      if(!(x)) BUG()
-#define DEBUGOUT(S)            printk(KERN_ERR S "\n")
-#define DEBUGOUT1(S, A...)     printk(KERN_ERR S "\n", A)
+#define DEBUGOUT(S)            printk(KERN_DEBUG S "\n")
+#define DEBUGOUT1(S, A...)     printk(KERN_DEBUG S "\n", A)
 #else
-#define ASSERT(x)
 #define DEBUGOUT(S)
 #define DEBUGOUT1(S, A...)
 #endif
 
+#define DEBUGFUNC(F) DEBUGOUT(F)
 #define DEBUGOUT2 DEBUGOUT1
-#define DEBUGOUT3 DEBUGOUT1
-#define DEBUGOUT7 DEBUGOUT1
-#define DEBUGFUNC(F)        DEBUGOUT(F)
+#define DEBUGOUT3 DEBUGOUT2
+#define DEBUGOUT7 DEBUGOUT3
 
 #define IXGB_WRITE_REG(a, reg, value) ( \
     writel((value), ((a)->hw_addr + IXGB_##reg)))
@@ -81,4 +89,8 @@ typedef enum {
 #define IXGB_READ_REG_ARRAY(a, reg, offset) ( \
     readl((a)->hw_addr + IXGB_##reg + ((offset) << 2)))
 
-#endif                         /* IXGB_OSDEP_H */
+#define IXGB_WRITE_FLUSH(a) IXGB_READ_REG(a, STATUS)
+
+#define IXGB_MEMCPY memcpy
+
+#endif                         /* _IXGB_OSDEP_H_ */