Changeset 3318 for i2c/trunk/kernel/i2c.h

Timestamp:

07/18/99 16:01:33 (14 years ago)

Author:

frodo

Message:

Namespace and copyright clean-up

* All copyright headers now have the right filename in them
* Files without copyrights now have them
* All copyrights are now until 1999
* Copyright owners were not changed; files into which Kyösti or Frodo made

signifiant changes mention them now, though.

* External module symbols now all begin with i2c_ for all modules, except

some names which can't be changed (init_module and other module related
symbols).

* Header files define nothing which does not begin with i2c_ or I2C_.

That means some symbols have changed names!

The current files are completely namespace-clean. This will lessen the
chance of (future) clashes with other kernel symbols, especially if it
is patched into the kernel.

Files:

• i2c/trunk/kernel/i2c.h (modified) (5 diffs)

i2c/trunk/kernel/i2c.h

@@ -4 +4 @@
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995 Simon G. Vogl
+/*   Copyright (C) 1995-1999 Simon G. Vogl
 
     This program is free software; you can redistribute it and/or modify
@@ -20 +20 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-#ifndef _I2C_H
-#define _I2C_H
+
+/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
+   Frodo Looijaard <frodol@dds.nl> */
+
+#ifndef I2C_H
+#define I2C_H
 
 #ifdef __KERNEL__
@@ -348 +352 @@
  */
 
-#define ALGO_NONE       0x000000
-#define ALGO_BIT        0x010000        /* bit style adapters           */
-#define ALGO_PCF        0x020000        /* PCF 8584 style adapters      */
-#define ALGO_SMBUS      0x040000
-#define ALGO_ISA        0x050000
-#define ALGO_SAA7146A   0x060000        /* SAA 7146 video decoder bus   */
-
-
-#define ALGO_EXP        0x800000        /* experimental                 */
-
-#define ALGO_MASK       0xff0000        /* Mask for algorithms          */
-#define ALGO_SHIFT      0x10    /* right shift to get index values      */
+#define I2C_ALGO_NONE   0x000000
+#define I2C_ALGO_BIT    0x010000        /* bit style adapters           */
+#define I2C_ALGO_PCF    0x020000        /* PCF 8584 style adapters      */
+#define I2C_ALGO_SMBUS  0x040000
+#define I2C_ALGO_ISA    0x050000
+#define I2C_ALGO_SAA7146A 0x060000      /* SAA 7146 video decoder bus   */
+
+
+#define I2C_ALGO_EXP    0x800000        /* experimental                 */
+
+#define I2C_ALGO_MASK   0xff0000        /* Mask for algorithms          */
+#define I2C_ALGO_SHIFT  0x10    /* right shift to get index values      */
 
 #define I2C_HW_ADAPS    0x10000         /* # adapter types              */
@@ -369 +373 @@
 
 /* --- Bit algorithm adapters                                           */
-#define HW_B_LP         0x00    /* Parallel port Philips style adapter  */
-#define HW_B_LPC        0x01    /* Parallel port, over control reg.     */
-#define HW_B_SER        0x02    /* Serial line interface                */
-#define HW_B_ELV        0x03    /* ELV Card                             */
-#define HW_B_VELLE      0x04    /* Vellemann K8000                      */
-#define HW_B_BT848      0x05    /* BT848 video boards                   */
-#define HW_B_WNV        0x06    /* Winnov Videums                       */
-#define HW_B_VIA        0x07    /* Via vt82c586b                        */
-#define HW_B_HYDRA      0x08    /* Apple Hydra Mac I/O                  */
+#define I2C_HW_B_LP     0x00    /* Parallel port Philips style adapter  */
+#define I2C_HW_B_LPC    0x01    /* Parallel port, over control reg.     */
+#define I2C_HW_B_SER    0x02    /* Serial line interface                */
+#define I2C_HW_B_ELV    0x03    /* ELV Card                             */
+#define I2C_HW_B_VELLE  0x04    /* Vellemann K8000                      */
+#define I2C_HW_B_BT848  0x05    /* BT848 video boards                   */
+#define I2C_HW_B_WNV    0x06    /* Winnov Videums                       */
+#define I2C_HW_B_VIA    0x07    /* Via vt82c586b                        */
+#define I2C_HW_B_HYDRA  0x08    /* Apple Hydra Mac I/O                  */
 
 /* --- PCF 8584 based algorithms                                        */
-#define HW_P_LP         0x00    /* Parallel port interface              */
-#define HW_P_ISA        0x01    /* generic ISA Bus inteface card        */
-#define HW_P_ELEK       0x02    /* Elektor ISA Bus inteface card        */
+#define I2C_HW_P_LP     0x00    /* Parallel port interface              */
+#define I2C_HW_P_ISA    0x01    /* generic ISA Bus inteface card        */
+#define I2C_HW_P_ELEK   0x02    /* Elektor ISA Bus inteface card        */
 
 
@@ -413 +417 @@
 #    include <asm/errno.h>
 #  endif
-#endif
+#endif /* I2C_H */