Changeset 3355

Timestamp:

08/26/99 16:33:28 (14 years ago)

Author:

kmalkki

Message:

(Kyösti)

• removed i2c_master_{send,recv}_subaddress

Not needed, one should use i2c_transfer or i2c_smbus_* calls instead.

• added I2C_DRIVERIDs for Katos -compatibility

Katos is a similar video4linux project as bttv, but supports cards
manufactured by ATI. I am porting their i2c code to be compatible with
the i2c CVS tree.

Location:

i2c/trunk/kernel

Files:

• i2c-core.c (modified) (2 diffs)
• i2c.h (modified) (5 diffs)

i2c/trunk/kernel/i2c-core.c

@@ -727 +727 @@
         }
 }
-
-int i2c_master_send_subadress(struct i2c_client *client,const char *buf ,int count, int subadress)
-{
-        char*   c;
-        
-        int ret;
-        struct i2c_adapter *adap=client->adapter;
-        struct i2c_msg msg;
-
-        if (client->adapter->algo->master_xfer) {
-                c = (char*)kmalloc(sizeof(char)*(count+1),GFP_KERNEL);
-                if (0 == c) 
-                        return -ENOMEM;
-        
-                msg.addr   = client->addr;
-                msg.flags  = client->flags & ( I2C_M_TEN|I2C_M_TENMASK );
-                msg.len = count+1;
-                (const char *)msg.buf = c;
-                        
-                c[0] = subadress;
-                memcpy(&c[1], buf, sizeof(char)*count);
-                
-                DEB(printk("i2c-core.o: master_send_subadress: writing %d bytes on %s. (sa:0x%02x)\n",
-                        count,client->adapter->name,subadress));
-        
-                I2C_LOCK(adap);
-                ret = adap->algo->master_xfer(adap,&msg,1);
-                I2C_UNLOCK(adap);
-
-                /* if everything went ok (i.e. 1 msg transmitted), return #bytes
-                * transmitted, else error code.
-                */
-         
-                kfree(c);
-                
-                return (ret == 1 )? count : ret;
-        } else {
-                printk("i2c-core.o: I2C adapter %04x: I2C level transfers not supported\n",
-                       client->adapter->id);
-                return 0;
-        }
-}
-
-
-int i2c_master_recv_subadress(struct i2c_client *client,const char *buf ,int count, int subadress)
-{
-        int     ret;
-        struct  i2c_adapter *adap=client->adapter;
-        struct  i2c_msg msg[2];
-        
-        if (client->adapter->algo->master_xfer) {
-                msg[0].addr     = client->addr;
-                msg[0].flags    = client->flags & ( I2C_M_TEN|I2C_M_TENMASK );
-                msg[0].len      = 1;
-                (const char*)msg[0].buf = (const char*)&subadress;
-        
-                msg[1].addr     = client->addr;
-                msg[1].flags    = client->flags & ( I2C_M_TEN|I2C_M_TENMASK );
-                msg[1].flags    |= I2C_M_RD;
-                msg[1].len      = count;
-                (const char*)msg[1].buf = (const char*)buf;
-                
-                DEB(printk("i2c-core.o: master_recv_subadress: reading %d bytes from subadress %d on %s.\n",
-                        count,subadress,client->adapter->name));
-        
-                I2C_LOCK(adap);
-                ret = adap->algo->master_xfer(adap,msg,2);
-                I2C_UNLOCK(adap);
-
-                /* if everything went ok (i.e. 1 msg transmitted),
-                return 0, else return error code.
-                */
-                return (ret == 1 ) ? 0 : ret;
-        } else {
-                printk("i2c-core.o: I2C adapter %04x: I2C level transfers not supported\n",
-                       client->adapter->id);
-                return 0;
-        }
-}
-
-
 
 int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
@@ -1310 +1229 @@
 EXPORT_SYMBOL(i2c_master_send);
 EXPORT_SYMBOL(i2c_master_recv);
-EXPORT_SYMBOL(i2c_master_send_subadress);
-EXPORT_SYMBOL(i2c_master_recv_subadress);
 EXPORT_SYMBOL(i2c_control);
 EXPORT_SYMBOL(i2c_transfer);

i2c/trunk/kernel/i2c.h

@@ -76 +76 @@
  */
 extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num);
-
-/* Two convenience functions: send bytes to/recv from a chip with  
- * sending one byte of data first, normally a register address.
- */
-extern int i2c_master_send_subadress(struct i2c_client *client,
-                                     const char *buf ,int count, int subadress);
-extern int i2c_master_recv_subadress(struct i2c_client *client,const char *buf,
-                                     int count, int subadress);
-
 
 /*
@@ -107 +98 @@
 #define I2C_M_TENMASK   0x06
 #define I2C_M_RD        0x01
+#define I2C_M_PROBE     0x20
         short len;              /* msg length                           */
         char *buf;              /* pointer to msg data                  */
@@ -427 +419 @@
 #define I2C_DRIVERID_TUNER       2
 #define I2C_DRIVERID_VIDEOTEXT   3
+#define I2C_DRIVERID_TDA8425     4      /* stereo sound processor       */
 #define I2C_DRIVERID_TEA6420     5      /* audio matrix switch          */
 #define I2C_DRIVERID_TEA6415C    6      /* video matrix switch          */
@@ -441 +434 @@
 #define I2C_DRIVERID_AT24Cxx    17      /* eeprom 1/2/4/8/16 K          */
 #define I2C_DRIVERID_BT848      18      /* dummy client driver          */
+#define I2C_DRIVERID_BT829      19      /* dummy client driver          */
 
 #define I2C_DRIVERID_EXP0       0xF0    /* experimental use id's        */
@@ -460 +454 @@
 #define I2C_ALGO_BIT    0x010000        /* bit style adapters           */
 #define I2C_ALGO_PCF    0x020000        /* PCF 8584 style adapters      */
+#define I2C_ALGO_ATI    0x030000        /* ATI video card               */
 #define I2C_ALGO_SMBUS  0x040000
 #define I2C_ALGO_ISA    0x050000        /* lm_sensors ISA pseudo-adapter */