Changeset 698

Timestamp:

01/15/00 20:01:54 (9 years ago)

Author:

mds

Message:

(mds) Add Banshee support and DDC bus support.

Simultaneous DDC and I2C access may cause errors.
No support for multiple Voodoo3/Banshee chips, only first one
is handled.

Files:

• lm-sensors/trunk/kernel/busses/i2c-voodoo3.c (modified) (20 diffs)

lm-sensors/trunk/kernel/busses/i2c-voodoo3.c

@@ -3 +3 @@
-              monitoring
-    Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>,
-
-
+
+
+
-    
-    Based on code written by Ralph Metzler <rjkm@thp.uni-koeln.de> and
@@ -59 +60 @@
-#ifndef PCI_DEVICE_ID_3DFX_VOODOO3
-#define PCI_DEVICE_ID_3DFX_VOODOO3 0x05
+#endif
+#ifndef PCI_DEVICE_ID_3DFX_BANSHEE
+#define PCI_DEVICE_ID_3DFX_BANSHEE 0x03
-#endif
-
@@ -84 +88 @@
-static int Voodoo3_I2CWrite_byte_data(int addr,int command,int data);
-static int Voodoo3_I2CWrite_word(int addr,int command,long data);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static void voodoo3_inc(struct i2c_adapter *adapter);
-static void voodoo3_dec(struct i2c_adapter *adapter);
@@ -105 +124 @@
-};
-
-
+i2c_
- "unset",
- I2C_ALGO_SMBUS | I2C_HW_SMBUS_VOODOO3,
@@ -116 +135 @@
-};
-
+static struct i2c_algorithm ddc_algorithm = {
+  /* name */            "DDC I2C adapter",
+  /* id */              I2C_ALGO_SMBUS,
+  /* master_xfer */     NULL,
+  /* smbus_access */    &voodoo3_ddc_access,
+  /* slave_send */      NULL,
+  /* slave_rcv */       NULL,
+  /* algo_control */    NULL,
+  /* functionality */   voodoo3_func,
+};
+
+static struct i2c_adapter voodoo3_ddc_adapter = {
+ "unset",
+ I2C_ALGO_SMBUS | I2C_HW_SMBUS_VOODOO3,
+ &ddc_algorithm,
+ NULL,
+ voodoo3_inc,
+ voodoo3_dec,
+ NULL,
+ NULL,
+};
+
-static int __initdata voodoo3_initialized;
-static unsigned short voodoo3_smba = 0;
-98
+fc
-static unsigned char *mem;
-static int v3_num;
@@ -127 +168 @@
-}
-
-
-extern inline unsigned int readlong(int off)
-{
@@ -138 +178 @@
-        udelay(10);
-}
+
+/* For I2C BUS */
-
-extern inline void dat(int data)
@@ -162 +204 @@
-        return((readlong(0x78)&(1<<27) )!=0 );
-}
+
+/* For DDC BUS */
+
+extern inline void ddc_dat(int data)
+{
+  state&=~(1<<20);
+  if (data)
+    state|=(1<<20);
+}
+
+extern inline void ddc_clkon(void)
+{
+  state|=(1<<19);
+}
+
+extern inline void ddc_clkoff(void)
+{
+  state&=~(1<<19);
+}
+
+extern inline int ddc_rdat(void)
+{
+        ddc_dat(1);
+        out();
+        return((readlong(0x78)&(1<<22) )!=0 );
+}
+
+/* For I2C BUS */
-
-/* Changing the Data line while clock is 'on' (high) is a
@@ -196 +266 @@
-int Voodoo3_I2CAck(int ackit)
-{
-
+=0
-
-  out();
@@ -260 +330 @@
-  return 0;
-}
+
+/* For DDC BUS */
+
+void Voodoo3_DDCStart(void)
+{
+  ddc_clkon(); /* in theory, clk is already on */
+  out();
+  out();
+  out();
+  out();
+  ddc_dat(0);
+  out();
+  ddc_clkoff();
+  out();
+}
+
+void Voodoo3_DDCStop(void)
+{
+  ddc_dat(0);
+  out();
+  ddc_clkon();
+  out();
+  ddc_dat(1);
+  out();
+  ddc_clkoff();
+  out();
+  out();
+  ddc_clkon();
+  out();
+}
+
+int Voodoo3_DDCAck(int ackit)
+{
+int ack=0;
+
+  out();
+  ddc_clkon();
+  if (!ackit) {
+   ack=ddc_rdat();
+  } else { ddc_dat(0); }
+  out();
+  ddc_clkoff();
+  out();
+  return ack;
+}
+
+int Voodoo3_DDCReadByte(int ackit)
+{
+  int i,temp;
+  unsigned char data=0;
+
+  for (i=7; i>=0; i--) {
+    out();
+    ddc_clkon();
+    data|=(ddc_rdat()<<i);
+    out();
+    ddc_clkoff();
+    out();
+  }
+  temp=Voodoo3_DDCAck(ackit);
+  return data;
+}
+
+int Voodoo3_DDCSendByte(unsigned char data)
+{
+  int i,temp;
+
+  for (i=7; i>=0; i--) {
+    ddc_dat(temp=data&(1<<i));
+    out();
+    ddc_clkon();
+    out();
+    out();
+    ddc_clkoff();
+    out();
+  }
+  temp=Voodoo3_DDCAck(0);
+  return temp;
+}
+
+
+int Voodoo3_DDCBusCheck(void) {
+/* Check the bus to see if it is in use */
+
+  if (! ddc_rdat()) {
+    printk("i2c-voodoo3: I2C bus in use or hung!  Try again later.\n");
+    return 1;
+  }
+  return 0;
+}
+
+/* For I2C Bus */
-
-int Voodoo3_I2CRead_byte(int addr)
@@ -413 +575 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-        unsigned int cadr;
@@ -430 +691 @@
-        
-        *((unsigned int *)(mem+0x70))=0x8160;
-98
+fc
-        printk("i2c-voodoo3: Using Banshee/Voodoo3 at 0x%p\n",mem);
-}
@@ -448 +709 @@
-        dev = NULL;
-        do {
-
-
-
-
-
+
+
+
+
-                        v3_num++;
+                }
+        } while(dev);
+
+        dev = NULL;
+        do {
+                if((dev = pci_find_device(PCI_VENDOR_ID_3DFX,
+                                           PCI_DEVICE_ID_3DFX_BANSHEE,dev))) {
+                        if(!v3_num)
+                                config_v3(dev);
+                        v3_num++;
+                }
-        } while(dev);
-
@@ -460 +731 @@
-                return 0;
-        } else {
-v3tv
+i2c-voodoo3
-                return -ENODEV;
-        }
-}
-
+/* For I2C BUS */
-
-/* Return -1 on error. See smbus.h for more information */
@@ -471 +743 @@
-                   u8 command, int size, union i2c_smbus_data * data)
-{
-
+  
-
-  if (Voodoo3_BusCheck()) return -1;
@@ -517 +789 @@
-}
-
+/* For DDC BUS */
+
+/* Return -1 on error. See smbus.h for more information */
+s32 voodoo3_ddc_access(struct i2c_adapter *adap, u16 addr, 
+                   unsigned short flags, char read_write,
+                   u8 command, int size, union i2c_smbus_data * data)
+{
+  int temp=0;
+
+  if (Voodoo3_DDCBusCheck()) return -1;
+
+  if ((read_write != I2C_SMBUS_READ) && (read_write != I2C_SMBUS_WRITE)) {
+        printk("i2c-voodoo3: Unknown read_write command! (0x%X)\n",read_write);
+        return -1;
+  }
+  addr=((addr & 0x7f) << 1) | (read_write & 0x01);
+  switch(size) {
+    case I2C_SMBUS_QUICK:
+        Voodoo3_DDCStart();
+        if (Voodoo3_DDCSendByte(addr)) { 
+          return -1; }
+    case I2C_SMBUS_BYTE:
+        if (read_write == I2C_SMBUS_READ) { temp=Voodoo3_DDCRead_byte(addr); data->byte=temp;
+        } else { temp=Voodoo3_DDCWrite_byte(addr,command); }
+        goto TESTACK;
+    case I2C_SMBUS_BYTE_DATA:
+        if (read_write == I2C_SMBUS_READ) { temp=Voodoo3_DDCRead_byte_data(addr,command); data->byte=temp;
+        } else { temp=Voodoo3_DDCWrite_byte_data(addr,command,data->byte); }
+        goto TESTACK;
+    case I2C_SMBUS_WORD_DATA:
+        if (read_write == I2C_SMBUS_READ) { temp=Voodoo3_DDCRead_word(addr,command); data->word=temp;
+        } else { temp=Voodoo3_DDCWrite_word(addr,command,data->word); }
+        goto TESTACK;
+    case I2C_SMBUS_PROC_CALL:
+        printk("i2c-voodoo3: Proc call not supported.\n");
+        return -1;
+    case I2C_SMBUS_BLOCK_DATA:
+        printk("i2c-voodoo3: Block transfers not supported yet.\n");
+        return -1;
+  }
+
+TESTACK: if (temp < 0) {
+                return -1;
+          }
+        return 0;
+}
+
-void voodoo3_inc(struct i2c_adapter *adapter)
-{
@@ -552 +871 @@
-  }
-  voodoo3_initialized ++;
-
-
+i2c_
+i2c_
-    printk("i2c-voodoo3.o: Adapter registration failed, module not inserted.\n");
-    voodoo3_cleanup();
-    return res;
-  }
+  voodoo3_initialized ++;
+  sprintf(voodoo3_ddc_adapter.name,"DDC Voodoo3 adapter at %04x",voodoo3_smba);
+  if ((res = i2c_add_adapter(&voodoo3_ddc_adapter))) {
+    printk("i2c-voodoo3.o: Adapter registration failed, module not inserted.\n");
+    voodoo3_cleanup();
+    return res;
+  }
-  voodoo3_initialized++;
-bu
+and DDC busse
-  return 0;
-}
@@ -568 +894 @@
-  
-  iounmap(mem);
-2
+3
-  {
-
+ddc_
-      printk("i2c-voodoo3.o: i2c_del_adapter failed, module not removed\n");
-      return res;
@@ -576 +902 @@
-      voodoo3_initialized--;
-  }
+  if (voodoo3_initialized >= 2)
+  {
+    if ((res = i2c_del_adapter(&voodoo3_i2c_adapter))) {
+      printk("i2c-voodoo3.o: i2c_del_adapter failed, module not removed\n");
+      return res;
+    } else
+      voodoo3_initialized--;
+  }
-  if (voodoo3_initialized >= 1) {
-    voodoo3_initialized--;
@@ -586 +920 @@
-#ifdef MODULE
-
- and Philip Edelbrock <phil@netroedge.com> and Ralph Metzler <rjkm@thp.uni-koeln.de
+, Philip Edelbrock <phil@netroedge.com>, Ralph Metzler <rjkm@thp.uni-koeln.de>, and Mark D. Studebaker <mdsxyz123@yahoo.com
-MODULE_DESCRIPTION("Voodoo3 I2C/SMBus driver");
-