Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / staging / slicoss / slic_os.h

diff --git a/drivers/staging/slicoss/slic_os.h b/drivers/staging/slicoss/slic_os.h
deleted file mode 100644 (file)
index 46c6784..0000000
--- a/drivers/staging/slicoss/slic_os.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/**************************************************************************
- *
- * Copyright (c)2000-2002 Alacritech, Inc.  All rights reserved.
- *
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above
- *    copyright notice, this list of conditions and the following
- *    disclaimer in the documentation and/or other materials provided
- *    with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL ALACRITECH, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation
- * are those of the authors and should not be interpreted as representing
- * official policies, either expressed or implied, of Alacritech, Inc.
- *
- **************************************************************************/
-
-/*
- * FILENAME: slic_os.h
- *
- * These are the Linux-specific definitions required for the SLICOSS
- * driver, which should allow for greater portability to other OSes.
- */
-#ifndef _SLIC_OS_SPECIFIC_H_
-#define _SLIC_OS_SPECIFIC_H_
-
-#define FALSE               (0)
-#define TRUE                (1)
-
-#define SLIC_SECS_TO_JIFFS(x)  ((x) * HZ)
-#define SLIC_MS_TO_JIFFIES(x)  (SLIC_SECS_TO_JIFFS((x)) / 1000)
-
-#ifdef DEBUG_REGISTER_TRACE
-#define WRITE_REG(reg, value, flush)                                      \
-       {                                                           \
-               adapter->card->reg_type[adapter->card->debug_ix] = 0;   \
-               adapter->card->reg_offset[adapter->card->debug_ix] = \
-               ((unsigned char *)(&reg)) - \
-               ((unsigned char *)adapter->slic_regs); \
-               adapter->card->reg_value[adapter->card->debug_ix++] = value;  \
-               if (adapter->card->debug_ix == 32) \
-                       adapter->card->debug_ix = 0;                      \
-               slic_reg32_write((&reg), (value), (flush));            \
-       }
-#define WRITE_REG64(a, reg, value, regh, valh, flush)                        \
-       {                                                           \
-               adapter->card->reg_type[adapter->card->debug_ix] = 1;        \
-               adapter->card->reg_offset[adapter->card->debug_ix] = \
-               ((unsigned char *)(&reg)) - \
-               ((unsigned char *)adapter->slic_regs); \
-               adapter->card->reg_value[adapter->card->debug_ix] = value;   \
-               adapter->card->reg_valueh[adapter->card->debug_ix++] = valh;  \
-               if (adapter->card->debug_ix == 32) \
-                       adapter->card->debug_ix = 0;                      \
-               slic_reg64_write((a), (&reg), (value), (&regh), (valh), \
-                               (flush));\
-       }
-#else
-#define WRITE_REG(reg, value, flush) \
-       slic_reg32_write((&reg), (value), (flush))
-#define WRITE_REG64(a, reg, value, regh, valh, flush) \
-       slic_reg64_write((a), (&reg), (value), (&regh), (valh), (flush))
-#endif
-
-#endif  /* _SLIC_OS_SPECIFIC_H_  */
-