From 149dded2b178bc0fb62cb6f61b87968d914b580a Mon Sep 17 00:00:00 2001 From: wdenk Date: Wed, 10 Sep 2003 18:20:28 +0000 Subject: * Add support for USB Mass Storage Devices (BBB) (tested with USB memory sticks only) * Avoid flicker on TRAB's VFD --- drivers/sk98lin/h/ski2c.h | 2 ++ drivers/sk98lin/skaddr.c | 5 +++++ drivers/sk98lin/skcsum.c | 6 ++++++ drivers/sk98lin/skge.c | 6 ++++++ drivers/sk98lin/skgehwt.c | 6 ++++++ drivers/sk98lin/skgeinit.c | 6 ++++++ drivers/sk98lin/skgemib.c | 5 +++++ drivers/sk98lin/skgepnmi.c | 6 ++++++ drivers/sk98lin/skgesirq.c | 6 ++++++ drivers/sk98lin/ski2c.c | 6 ++++++ drivers/sk98lin/sklm80.c | 6 ++++++ drivers/sk98lin/skproc.c | 7 +++++-- drivers/sk98lin/skqueue.c | 6 ++++++ drivers/sk98lin/skrlmt.c | 6 ++++++ drivers/sk98lin/sktimer.c | 6 ++++++ drivers/sk98lin/skvpd.c | 5 +++++ drivers/sk98lin/skxmac2.c | 6 ++++++ drivers/sk98lin/uboot_skb.c | 6 ++++++ 18 files changed, 100 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/sk98lin/h/ski2c.h b/drivers/sk98lin/h/ski2c.h index db2d4e65ca..5316bbacba 100644 --- a/drivers/sk98lin/h/ski2c.h +++ b/drivers/sk98lin/h/ski2c.h @@ -161,6 +161,8 @@ typedef struct s_Sensor SK_SENSOR; /* * 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 4677111833..f2486032ee 100644 --- a/drivers/sk98lin/skaddr.c +++ b/drivers/sk98lin/skaddr.c @@ -218,6 +218,10 @@ * ******************************************************************************/ +#include + +#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 @@ SK_U32 ToPortNumber) /* Port2 Index */ } #endif /* __cplusplus */ +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/skcsum.c b/drivers/sk98lin/skcsum.c index 9630fad0df..0fd70301b6 100644 --- a/drivers/sk98lin/skcsum.c +++ b/drivers/sk98lin/skcsum.c @@ -70,6 +70,10 @@ * ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + #ifdef SK_USE_CSUM /* Check if CSUM is to be used. */ #ifndef lint @@ -921,3 +925,5 @@ SK_EVPARA Param) /* Event dependent parameter. */ } /* SkCsEvent */ #endif /* SK_USE_CSUM */ + +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/skge.c b/drivers/sk98lin/skge.c index 49ef8b310a..01a72e13cb 100644 --- a/drivers/sk98lin/skge.c +++ b/drivers/sk98lin/skge.c @@ -340,6 +340,10 @@ * ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + #include "h/skversion.h" #if 0 #include @@ -4862,6 +4866,8 @@ int l; #endif +#endif /* CONFIG_SK98 */ + /* * Local variables: * compile-command: "make" diff --git a/drivers/sk98lin/skgehwt.c b/drivers/sk98lin/skgehwt.c index 8996b7fae7..10c366d01e 100644 --- a/drivers/sk98lin/skgehwt.c +++ b/drivers/sk98lin/skgehwt.c @@ -73,6 +73,10 @@ ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + /* Event queue and dispatcher */ @@ -211,4 +215,6 @@ SK_IOC Ioc) /* IoContext */ SkTimerDone(pAC,Ioc) ; } +#endif /* CONFIG_SK98 */ + /* End of file */ diff --git a/drivers/sk98lin/skgeinit.c b/drivers/sk98lin/skgeinit.c index 42a64248ad..cb6e20f022 100644 --- a/drivers/sk98lin/skgeinit.c +++ b/drivers/sk98lin/skgeinit.c @@ -393,6 +393,10 @@ * ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + #include "h/skdrv1st.h" #include "h/skdrv2nd.h" @@ -2364,3 +2368,5 @@ int Port) /* Port to configure */ return(0); } /* SkGeInitPort */ + +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/skgemib.c b/drivers/sk98lin/skgemib.c index 3f5a7f5b97..ab85ccd4e4 100644 --- a/drivers/sk98lin/skgemib.c +++ b/drivers/sk98lin/skgemib.c @@ -50,6 +50,10 @@ * ****************************************************************************/ +#include + +#ifdef CONFIG_SK98 + /* * PRIVATE OID handler function prototypes */ @@ -1054,3 +1058,4 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTable[] = { SK_PNMI_RO, Vct, 0}, }; +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/skgepnmi.c b/drivers/sk98lin/skgepnmi.c index 498c85d3c7..d1c1a3e7d0 100644 --- a/drivers/sk98lin/skgepnmi.c +++ b/drivers/sk98lin/skgepnmi.c @@ -432,6 +432,10 @@ ****************************************************************************/ +#include + +#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 @@ SK_U32 PhysPortIndex) } } /* CheckVctStatus */ + +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/skgesirq.c b/drivers/sk98lin/skgesirq.c index 581368ea21..c7c04b70ec 100644 --- a/drivers/sk98lin/skgesirq.c +++ b/drivers/sk98lin/skgesirq.c @@ -337,6 +337,10 @@ * ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + /* * Special Interrupt handler * @@ -2408,4 +2412,6 @@ SK_U16 IStatus) /* Interrupt Status */ } /* SkPhyIsrLone */ #endif /* OTHER_PHY */ +#endif /* CONFIG_SK98 */ + /* End of File */ diff --git a/drivers/sk98lin/ski2c.c b/drivers/sk98lin/ski2c.c index 671f76ea57..b262f29a8d 100644 --- a/drivers/sk98lin/ski2c.c +++ b/drivers/sk98lin/ski2c.c @@ -228,6 +228,10 @@ ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + /* * I2C Protocol */ @@ -1497,3 +1501,5 @@ SK_EVPARA Para) /* Event specific Parameter */ } /* SkI2cEvent*/ #endif /* !SK_DIAG */ + +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/sklm80.c b/drivers/sk98lin/sklm80.c index 51c7cc46ae..1c96ee3a36 100644 --- a/drivers/sk98lin/sklm80.c +++ b/drivers/sk98lin/sklm80.c @@ -98,6 +98,10 @@ ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + /* LM80 functions */ @@ -284,3 +288,5 @@ SK_SENSOR *pSen) /* Sensor to be read */ /* Not completed */ return(0); } + +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/skproc.c b/drivers/sk98lin/skproc.c index a23e55c504..ecba704816 100644 --- a/drivers/sk98lin/skproc.c +++ b/drivers/sk98lin/skproc.c @@ -70,6 +70,10 @@ * ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + #include #include "h/skdrv1st.h" @@ -511,5 +515,4 @@ char * SkNumber(char * str, long long num, int base, int size, int precision return strorg; } - - +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/skqueue.c b/drivers/sk98lin/skqueue.c index c279cd17a2..c9740e316b 100644 --- a/drivers/sk98lin/skqueue.c +++ b/drivers/sk98lin/skqueue.c @@ -87,6 +87,10 @@ ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + /* Event queue and dispatcher */ @@ -233,4 +237,6 @@ SK_IOC Ioc) /* Io context */ return(0) ; } +#endif /* CONFIG_SK98 */ + /* End of file */ diff --git a/drivers/sk98lin/skrlmt.c b/drivers/sk98lin/skrlmt.c index 26b3f74005..1e707c9973 100644 --- a/drivers/sk98lin/skrlmt.c +++ b/drivers/sk98lin/skrlmt.c @@ -280,6 +280,10 @@ * ******************************************************************************/ +#include + +#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 @@ SK_EVPARA Para) /* Event-specific parameter */ #ifdef __cplusplus } #endif /* __cplusplus */ + +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/sktimer.c b/drivers/sk98lin/sktimer.c index e8894d24e7..67431d96aa 100644 --- a/drivers/sk98lin/sktimer.c +++ b/drivers/sk98lin/sktimer.c @@ -72,6 +72,10 @@ ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + /* Event queue and dispatcher */ @@ -288,4 +292,6 @@ int Restart) /* Do we need to restart the Hardware timer ? */ } } +#endif /* CONFIG_SK98 */ + /* End of file */ diff --git a/drivers/sk98lin/skvpd.c b/drivers/sk98lin/skvpd.c index 68c65d16b1..f4558fabf8 100644 --- a/drivers/sk98lin/skvpd.c +++ b/drivers/sk98lin/skvpd.c @@ -160,6 +160,10 @@ * ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + /* Please refer skvpd.txt for infomation how to include this module */ @@ -1323,3 +1327,4 @@ char *msg) /* error log message */ (void)VpdUpdate(pAC, IoC); } +#endif /* CONFIG_SK98 */ diff --git a/drivers/sk98lin/skxmac2.c b/drivers/sk98lin/skxmac2.c index c339ecaa8c..9c87b2393f 100644 --- a/drivers/sk98lin/skxmac2.c +++ b/drivers/sk98lin/skxmac2.c @@ -410,6 +410,10 @@ * ******************************************************************************/ +#include + +#ifdef CONFIG_SK98 + #include "h/skdrv1st.h" #include "h/skdrv2nd.h" @@ -4389,4 +4393,6 @@ SK_BOOL StartTest) /* flag for start / get result */ return(0); } /* SkGmCableDiagStatus */ +#endif /* CONFIG_SK98 */ + /* End of file */ diff --git a/drivers/sk98lin/uboot_skb.c b/drivers/sk98lin/uboot_skb.c index 9d86beabd2..b87ad163f6 100644 --- a/drivers/sk98lin/uboot_skb.c +++ b/drivers/sk98lin/uboot_skb.c @@ -23,6 +23,10 @@ * MA 02111-1307 USA */ +#include + +#ifdef CONFIG_SK98 + #include #include "u-boot_compat.h" @@ -114,3 +118,5 @@ void skb_put(struct sk_buff *skb, unsigned int len) { skb->len+=len; } + +#endif /* CONFIG_SK98 */ -- cgit v1.2.1