* Add support for USB Mass Storage Devices (BBB)
(tested with USB memory sticks only)
* Avoid flicker on TRAB's VFD
diff --git a/drivers/sk98lin/h/ski2c.h b/drivers/sk98lin/h/ski2c.h
index db2d4e6..5316bba 100644
--- a/drivers/sk98lin/h/ski2c.h
+++ b/drivers/sk98lin/h/ski2c.h
@@ -161,6 +161,8 @@
/*
* Define READ and WRITE Constants.
*/
+#undef I2C_READ /* just in case */
+#undef I2C_WRITE /* just in case */
#define I2C_READ 0
#define I2C_WRITE 1
#define I2C_BURST 1
diff --git a/drivers/sk98lin/skaddr.c b/drivers/sk98lin/skaddr.c
index 4677111..f248603 100644
--- a/drivers/sk98lin/skaddr.c
+++ b/drivers/sk98lin/skaddr.c
@@ -218,6 +218,10 @@
*
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
#ifndef lint
static const char SysKonnectFileId[] =
"@(#) $Id: skaddr.c,v 1.48 2003/02/12 17:09:37 tschilli Exp $ (C) SysKonnect.";
@@ -1872,3 +1876,4 @@
}
#endif /* __cplusplus */
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/skcsum.c b/drivers/sk98lin/skcsum.c
index 9630fad..0fd7030 100644
--- a/drivers/sk98lin/skcsum.c
+++ b/drivers/sk98lin/skcsum.c
@@ -70,6 +70,10 @@
*
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
#ifdef SK_USE_CSUM /* Check if CSUM is to be used. */
#ifndef lint
@@ -921,3 +925,5 @@
} /* SkCsEvent */
#endif /* SK_USE_CSUM */
+
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/skge.c b/drivers/sk98lin/skge.c
index 49ef8b3..01a72e1 100644
--- a/drivers/sk98lin/skge.c
+++ b/drivers/sk98lin/skge.c
@@ -340,6 +340,10 @@
*
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
#include "h/skversion.h"
#if 0
#include <linux/module.h>
@@ -4862,6 +4866,8 @@
#endif
+#endif /* CONFIG_SK98 */
+
/*
* Local variables:
* compile-command: "make"
diff --git a/drivers/sk98lin/skgehwt.c b/drivers/sk98lin/skgehwt.c
index 8996b7f..10c366d 100644
--- a/drivers/sk98lin/skgehwt.c
+++ b/drivers/sk98lin/skgehwt.c
@@ -73,6 +73,10 @@
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
/*
Event queue and dispatcher
*/
@@ -211,4 +215,6 @@
SkTimerDone(pAC,Ioc) ;
}
+#endif /* CONFIG_SK98 */
+
/* End of file */
diff --git a/drivers/sk98lin/skgeinit.c b/drivers/sk98lin/skgeinit.c
index 42a6424..cb6e20f 100644
--- a/drivers/sk98lin/skgeinit.c
+++ b/drivers/sk98lin/skgeinit.c
@@ -393,6 +393,10 @@
*
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
#include "h/skdrv1st.h"
#include "h/skdrv2nd.h"
@@ -2364,3 +2368,5 @@
return(0);
} /* SkGeInitPort */
+
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/skgemib.c b/drivers/sk98lin/skgemib.c
index 3f5a7f5..ab85ccd 100644
--- a/drivers/sk98lin/skgemib.c
+++ b/drivers/sk98lin/skgemib.c
@@ -50,6 +50,10 @@
*
****************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
/*
* PRIVATE OID handler function prototypes
*/
@@ -1054,3 +1058,4 @@
SK_PNMI_RO, Vct, 0},
};
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/skgepnmi.c b/drivers/sk98lin/skgepnmi.c
index 498c85d..d1c1a3e 100644
--- a/drivers/sk98lin/skgepnmi.c
+++ b/drivers/sk98lin/skgepnmi.c
@@ -432,6 +432,10 @@
****************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
static const char SysKonnectFileId[] =
"@(#) $Id: skgepnmi.c,v 1.102 2002/12/16 14:03:24 tschilli Exp $"
" (C) SysKonnect.";
@@ -8303,3 +8307,5 @@
}
} /* CheckVctStatus */
+
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/skgesirq.c b/drivers/sk98lin/skgesirq.c
index 581368e..c7c04b7 100644
--- a/drivers/sk98lin/skgesirq.c
+++ b/drivers/sk98lin/skgesirq.c
@@ -337,6 +337,10 @@
*
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
/*
* Special Interrupt handler
*
@@ -2408,4 +2412,6 @@
} /* SkPhyIsrLone */
#endif /* OTHER_PHY */
+#endif /* CONFIG_SK98 */
+
/* End of File */
diff --git a/drivers/sk98lin/ski2c.c b/drivers/sk98lin/ski2c.c
index 671f76e..b262f29 100644
--- a/drivers/sk98lin/ski2c.c
+++ b/drivers/sk98lin/ski2c.c
@@ -228,6 +228,10 @@
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
/*
* I2C Protocol
*/
@@ -1497,3 +1501,5 @@
} /* SkI2cEvent*/
#endif /* !SK_DIAG */
+
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/sklm80.c b/drivers/sk98lin/sklm80.c
index 51c7cc4..1c96ee3 100644
--- a/drivers/sk98lin/sklm80.c
+++ b/drivers/sk98lin/sklm80.c
@@ -98,6 +98,10 @@
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
/*
LM80 functions
*/
@@ -284,3 +288,5 @@
/* Not completed */
return(0);
}
+
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/skproc.c b/drivers/sk98lin/skproc.c
index a23e55c..ecba704 100644
--- a/drivers/sk98lin/skproc.c
+++ b/drivers/sk98lin/skproc.c
@@ -70,6 +70,10 @@
*
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
#include <linux/proc_fs.h>
#include "h/skdrv1st.h"
@@ -511,5 +515,4 @@
return strorg;
}
-
-
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/skqueue.c b/drivers/sk98lin/skqueue.c
index c279cd1..c9740e3 100644
--- a/drivers/sk98lin/skqueue.c
+++ b/drivers/sk98lin/skqueue.c
@@ -87,6 +87,10 @@
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
/*
Event queue and dispatcher
*/
@@ -233,4 +237,6 @@
return(0) ;
}
+#endif /* CONFIG_SK98 */
+
/* End of file */
diff --git a/drivers/sk98lin/skrlmt.c b/drivers/sk98lin/skrlmt.c
index 26b3f74..1e707c9 100644
--- a/drivers/sk98lin/skrlmt.c
+++ b/drivers/sk98lin/skrlmt.c
@@ -280,6 +280,10 @@
*
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
#ifndef lint
static const char SysKonnectFileId[] =
"@(#) $Id: skrlmt.c,v 1.68 2003/01/31 15:26:56 rschmidt Exp $ (C) SysKonnect.";
@@ -3500,3 +3504,5 @@
#ifdef __cplusplus
}
#endif /* __cplusplus */
+
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/sktimer.c b/drivers/sk98lin/sktimer.c
index e8894d2..67431d9 100644
--- a/drivers/sk98lin/sktimer.c
+++ b/drivers/sk98lin/sktimer.c
@@ -72,6 +72,10 @@
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
/*
Event queue and dispatcher
*/
@@ -288,4 +292,6 @@
}
}
+#endif /* CONFIG_SK98 */
+
/* End of file */
diff --git a/drivers/sk98lin/skvpd.c b/drivers/sk98lin/skvpd.c
index 68c65d1..f4558fa 100644
--- a/drivers/sk98lin/skvpd.c
+++ b/drivers/sk98lin/skvpd.c
@@ -160,6 +160,10 @@
*
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
/*
Please refer skvpd.txt for infomation how to include this module
*/
@@ -1323,3 +1327,4 @@
(void)VpdUpdate(pAC, IoC);
}
+#endif /* CONFIG_SK98 */
diff --git a/drivers/sk98lin/skxmac2.c b/drivers/sk98lin/skxmac2.c
index c339eca..9c87b23 100644
--- a/drivers/sk98lin/skxmac2.c
+++ b/drivers/sk98lin/skxmac2.c
@@ -410,6 +410,10 @@
*
******************************************************************************/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
#include "h/skdrv1st.h"
#include "h/skdrv2nd.h"
@@ -4389,4 +4393,6 @@
return(0);
} /* SkGmCableDiagStatus */
+#endif /* CONFIG_SK98 */
+
/* End of file */
diff --git a/drivers/sk98lin/uboot_skb.c b/drivers/sk98lin/uboot_skb.c
index 9d86bea..b87ad16 100644
--- a/drivers/sk98lin/uboot_skb.c
+++ b/drivers/sk98lin/uboot_skb.c
@@ -23,6 +23,10 @@
* MA 02111-1307 USA
*/
+#include <config.h>
+
+#ifdef CONFIG_SK98
+
#include <common.h>
#include "u-boot_compat.h"
@@ -114,3 +118,5 @@
{
skb->len+=len;
}
+
+#endif /* CONFIG_SK98 */