patch-2.4.7 linux/drivers/net/sk98lin/h/ski2c.h

• Lines: 59
• Date: Wed Jul 4 11:50:39 2001
• Orig file: v2.4.6/linux/drivers/net/sk98lin/h/ski2c.h
• Orig date: Fri Sep 15 14:34:19 2000

diff -u --recursive --new-file v2.4.6/linux/drivers/net/sk98lin/h/ski2c.h linux/drivers/net/sk98lin/h/ski2c.h
@@ -2,8 +2,8 @@
  *
  * Name:	ski2c.h
  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
- * Version:	$Revision: 1.29 $
- * Date:	$Date: 2000/08/03 14:28:17 $
+ * Version:	$Revision: 1.30 $
+ * Date:	$Date: 2001/04/05 11:38:09 $
  * Purpose:	Defines to access Voltage and Temperature Sensor
  *		(taken from Monalisa (taken from Concentrator))
  *
@@ -28,6 +28,10 @@
  * History:
  *
  *	$Log: ski2c.h,v $
+ *	Revision 1.30  2001/04/05 11:38:09  rassmann
+ *	Set SenState to idle in SkI2cWaitIrq().
+ *	Changed error message in SkI2cWaitIrq().
+ *	
  *	Revision 1.29  2000/08/03 14:28:17  rassmann
  *	- Added function to wait for I2C being ready before resetting the board.
  *	- Replaced one duplicate "out of range" message with correct one.
@@ -182,24 +186,26 @@
 #define	SKERR_I2C_E014MSG	"WARNING: fan sensor out of range"
 #define	SKERR_I2C_E015		(SKERR_I2C_E014+1)
 #define	SKERR_I2C_E015MSG	"ERROR: fan sensor out of range"
+#define	SKERR_I2C_E016		(SKERR_I2C_E015+1)
+#define	SKERR_I2C_E016MSG	"I2C: active transfer does not complete.\n"
 
 /*
  * Define Timeout values
  */
-#define	SK_I2C_TIM_LONG		2000000L	/* 2 second */
-#define	SK_I2C_TIM_SHORT	100000L		/* 100 milli second */
+#define	SK_I2C_TIM_LONG		2000000L	/* 2 seconds */
+#define	SK_I2C_TIM_SHORT	 100000L	/* 100 milliseconds */
 
 /*
  * Define trap and error log hold times
  */
 #ifndef	SK_SEN_ERR_TR_HOLD
-#define	SK_SEN_ERR_TR_HOLD	(4*SK_TICKS_PER_SEC)
+#define	SK_SEN_ERR_TR_HOLD		(4*SK_TICKS_PER_SEC)
 #endif
 #ifndef	SK_SEN_ERR_LOG_HOLD
-#define	SK_SEN_ERR_LOG_HOLD	(60*SK_TICKS_PER_SEC)
+#define	SK_SEN_ERR_LOG_HOLD		(60*SK_TICKS_PER_SEC)
 #endif
 #ifndef	SK_SEN_WARN_TR_HOLD
-#define	SK_SEN_WARN_TR_HOLD	(15*SK_TICKS_PER_SEC)
+#define	SK_SEN_WARN_TR_HOLD		(15*SK_TICKS_PER_SEC)
 #endif
 #ifndef	SK_SEN_WARN_LOG_HOLD
 #define	SK_SEN_WARN_LOG_HOLD	(15*60*SK_TICKS_PER_SEC)
@@ -268,3 +274,4 @@
 
 #endif
 #endif	/* n_SKI2C_H */
+