[ddccontrol-cvs] ddccontrol/src/ddcpci sis.c,NONE,1.1 via.c,NONE,1.1 Makefile.am,1.7,1.8 ddcpci.h,1.

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/ddccontrol/ddccontrol/src/ddcpci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16483/src/ddcpci

Modified Files:
	Makefile.am ddcpci.h main.c 
Added Files:
	sis.c via.c 
Log Message:
Add support for VIA and SiS chipsets (Thanks to Johannes Deisenhofer)

Index: main.c
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddcpci/main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17

--- main.c	14 Feb 2006 21:59:05 -0000	1.16
+++ main.c	3 Mar 2006 21:08:57 -0000	1.17
@@ -40,6 +40,8 @@
 	&nvidia_open,
 	&radeon_open,
 	&i810_open,
+	&via_open,
+	&sis_open,
 	NULL
 };
 
@@ -47,6 +49,8 @@
 	&nvidia_close,
 	&radeon_close,
 	&i810_close,
+	&via_close,
+	&sis_close,
 	NULL
 };
 /* end of card list */

--- NEW FILE: sis.c ---
/*
    ddc/ci direct PCI memory interface for some SIS video cards

    Copyright 2006 Johannes Deisenhofer j.d...@to...
    Based on nvidia.c and the sis framebuffer driver from the Kernel source.
	Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria

    Copyright(c) 2004 Nicolas Boichat (ni...@bo...)
    Based on rivafb-i2c.c from the kernel source.
    Copyright 2004 Antonino A. Daplas <adaplas @pol.net>
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/io.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <unistd.h>

#include "ddcpci.h"
 
struct mem_data {
	char* memory; // mmaped memory
	size_t length; // mmaped memory length
};

struct i2c_data {
	unsigned short int ddc_base;
	u32		   cstate; // Register_state
};

#define VGA_WR08(p,i,d)  (outb(i,d))
#define VGA_RD08(p,i)    (inb(i))

#define VGA_SR_IX       0x3c4
#define VGA_SR_DATA     0x3c5

// There is only one bus probed. More busses are probably accessible in the same register,
// probably in pairs at bit positions 2/3, 4/5 

#define SIS_I2C_SCL     0x01
#define SIS_I2C_SDA     0x02


static void sis_gpio_setscl(void* data, int state)
{
	u32			val;
	struct i2c_data*	ldata = (struct i2c_data*)data;

	outb(ldata->ddc_base,VGA_SR_IX );
	val = inb(VGA_SR_DATA) & 0xfc;

	if (state)
		ldata->cstate |= SIS_I2C_SCL;
	else
		ldata->cstate &= ~SIS_I2C_SCL;

	val |= ldata->cstate;

	outb(val ,VGA_SR_DATA);
}

static void sis_gpio_setsda(void* data, int state)
{
	u32	val;
	struct i2c_data*	ldata = (struct i2c_data*)data;

	outb(ldata->ddc_base, VGA_SR_IX );
	val = inb(VGA_SR_DATA) & 0xfc;

	if (state)
		ldata->cstate |= SIS_I2C_SDA;
	else
		ldata->cstate &= ~SIS_I2C_SDA;

	val |= ldata->cstate;

	outb(val, VGA_SR_DATA);
}

static int sis_gpio_getscl(void* data)
{
	u32			val = 0;
	struct i2c_data*	ldata = (struct i2c_data*)data;

	outb(ldata->ddc_base, VGA_SR_IX);
	if (inb(VGA_SR_DATA) & SIS_I2C_SCL)
		val = 1;

	return val;
}

static int sis_gpio_getsda(void* data)
{
	u32			val = 0;
	struct 	i2c_data*	ldata = (struct i2c_data*)data;

	outb( ldata->ddc_base, VGA_SR_IX);
	if (inb(VGA_SR_DATA) & SIS_I2C_SDA)
		val = 1;

	return val;
}

static int init_i2c_bus(struct i2c_algo_bit_data* algo, char* PCIO, int ddc_base)
{
	//fprintf(stderr, "init_i2c_bus: (ddc_base: %#x)\n", ddc_base);
	// Request io Permission
	if(ioperm(VGA_SR_IX,2,1)<0)
	{
		perror("Request IO Perm");
		return 0;
	}
	struct i2c_data* data = malloc(sizeof(struct i2c_data));
	if (!data) {
		fprintf(stderr, _("sis.c:init_i2c_bus: Malloc error."));
		exit(-1);
	}
	data->ddc_base = ddc_base;
	data->cstate   = 0;	
	
	algo->setsda		= sis_gpio_setsda;
	algo->setscl		= sis_gpio_setscl;
	algo->getsda		= sis_gpio_getsda;
	algo->getscl		= sis_gpio_getscl;
	algo->udelay		= 40;
	algo->timeout		= 100;
	algo->data 		= data;
	
	/* Raise SCL and SDA */
	sis_gpio_setsda(algo->data, 1);
	sis_gpio_setscl(algo->data, 1);
	usleep(200000);
	
	//test_bus(algo, "Boubou");
	
	return 1;
}


struct card* sis_open(struct pci_dev *dev)
{
	// SIS
	if (dev->vendor_id != 0x1039) {
		return 0;
	}
/*       switch (dev->device_id) {
        case 0x6330: // PCI_DEVICE_ID_SIS_VGA_MIRAGE
                break;
        default:
                return 0;
        }*/

	
	struct card* sis_card = malloc(sizeof(struct card));
	if (!sis_card) {
		fprintf(stderr, _("%s: Malloc error.\n"), "sis_open");
		exit(-1);
	}
	memset(sis_card, 0, sizeof(struct card));
	
	sis_card->nbusses = 1;
	sis_card->i2c_busses = malloc(2*sizeof(struct i2c_algo_bit_data));

	// Note: Only first Bus is accessible
	init_i2c_bus(&sis_card->i2c_busses[0], 0, 0x11);
	
	return sis_card;
}

void sis_close(struct card* sis_card)
{
	int i;
	
	if (sis_card->data) {
		struct mem_data* data = sis_card->data;
		if ((data->memory) && (data->memory == MAP_FAILED) && (data->length)) {
			munmap(data->memory, data->length);
		}
		free(sis_card->data);
	}
	
	for (i = 0; i < sis_card->nbusses; i++) {
		free((&sis_card->i2c_busses[i])->data);
	}
	
	free(sis_card->i2c_busses);
	
	free(sis_card);
}


--- NEW FILE: via.c ---
/*
    ddc/ci direct PCI memory interface for VIA Unichrome cards

    Based on nvidia.c and via_i2c  from the openchrome Project ope...@so...
    and the savagefb-i2c.c from the Kernel sources

    Copyright 2006 Johannes Deisenhofer j.d...@to...
    Copyright 2004 The Unichrome Project  [unichrome.sf.net]
    Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
    Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
    Copyright 2004 Nicolas Boichat (ni...@bo...)
    Copyright 2004 Antonino A. Daplas <adaplas @pol.net>
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <unistd.h>

#include "ddcpci.h"
 
struct mem_data {
	int fd; // /dev/mem fd
	char* memory; // mmaped memory
	size_t length; // mmaped memory length
};

struct i2c_data {
	char* PCIO;
	int ddc_base;
};

typedef unsigned char  U008;

#define VGA_WR08(p,i,d)  (((U008 *)(p))[i]=(d))
#define VGA_RD08(p,i)    (((U008 *)(p))[i])

#define VGA_SR_IX       0x3c4
#define VGA_SR_DATA     0x3c5

#define UNICHROME_I2C_ENAB      0x01
#define UNICHROME_I2C_SCL_OUT   0x20
#define UNICHROME_I2C_SDA_OUT   0x10
#define UNICHROME_I2C_SCL_IN    0x08
#define UNICHROME_I2C_SDA_IN    0x04


static void via_gpio_setscl(void* data, int state)
{
	u32			val;

	VGA_WR08(((struct i2c_data*)data)->PCIO, VGA_SR_IX, ((struct i2c_data*)data)->ddc_base );
	val = VGA_RD08(((struct i2c_data*)data)->PCIO, VGA_SR_DATA);
	val |= UNICHROME_I2C_ENAB;

	if (state)
		val |= UNICHROME_I2C_SCL_OUT;
	else
		val &= ~UNICHROME_I2C_SCL_OUT;

	VGA_WR08(((struct i2c_data*)data)->PCIO, VGA_SR_DATA, val);
}

static void via_gpio_setsda(void* data, int state)
{
	u32			val;

	VGA_WR08(((struct i2c_data*)data)->PCIO, VGA_SR_IX, ((struct i2c_data*)data)->ddc_base );
	val = VGA_RD08(((struct i2c_data*)data)->PCIO, VGA_SR_DATA);
	val |= UNICHROME_I2C_ENAB;

	if (state)
		val |= UNICHROME_I2C_SDA_OUT;
	else
		val &= ~UNICHROME_I2C_SDA_OUT;

	VGA_WR08(((struct i2c_data*)data)->PCIO, VGA_SR_DATA, val);
}

static int via_gpio_getscl(void* data)
{
	u32			val = 0;

	VGA_WR08(((struct i2c_data*)data)->PCIO, VGA_SR_IX, ((struct i2c_data*)data)->ddc_base);
	if (VGA_RD08(((struct i2c_data*)data)->PCIO, VGA_SR_DATA) & UNICHROME_I2C_SCL_IN)
		val = 1;

	return val;
}

static int via_gpio_getsda(void* data)
{
	u32			val = 0;

	VGA_WR08(((struct i2c_data*)data)->PCIO, VGA_SR_IX, ((struct i2c_data*)data)->ddc_base);
	if (VGA_RD08(((struct i2c_data*)data)->PCIO, VGA_SR_DATA) & UNICHROME_I2C_SDA_IN)
		val = 1;

	return val;
}

static int init_i2c_bus(struct i2c_algo_bit_data* algo, char* PCIO, int ddc_base)
{
	//fprintf(stderr, "init_i2c_bus: (ddc_base: %#x)\n", ddc_base);
	struct i2c_data* data = malloc(sizeof(struct i2c_data));
	if (!data) {
		fprintf(stderr, _("via.c:init_i2c_bus: Malloc error."));
		exit(-1);
	}
	data->PCIO = PCIO;
	data->ddc_base = ddc_base;
	
	algo->setsda		= via_gpio_setsda;
	algo->setscl		= via_gpio_setscl;
	algo->getsda		= via_gpio_getsda;
	algo->getscl		= via_gpio_getscl;
	algo->udelay		= 40;
	algo->timeout		= 100;
	algo->data 		= data;
	
	/* Raise SCL and SDA */
	via_gpio_setsda(algo->data, 1);
	via_gpio_setscl(algo->data, 1);
	usleep(200000);
	
	//test_bus(algo, "Boubou");
	
	return 1;
}


struct card* via_open(struct pci_dev *dev)
{
	if (dev->vendor_id != 0x1106) {
		return 0;
	}
/*       switch (dev->device_id) {
        case 0x3122: // PCI_DEVICE_ID_VIA_UNICHROME
        case 0x3118: // PCI_DEVICE_ID_VIA_UNICHROME_PRO
                break;
        default:
                return 0;
        }*/

	
	struct card* via_card = malloc(sizeof(struct card));
	struct mem_data* data = malloc(sizeof(struct mem_data));
	if ((!via_card) || (!data)) {
		fprintf(stderr, _("%s: Malloc error.\n"), "via_open");
		exit(-1);
	}
	memset(via_card, 0, sizeof(struct card));
	
	via_card->data = data;
	
	data->fd = open("/dev/mem", O_RDWR);
	
	if (data->fd < 0) {
		perror(_("via_open: cannot open /dev/mem"));
		via_close(via_card);
		return 0;
	}
	
	data->length = 0x00001000;
	data->memory = mmap(data->memory, data->length, PROT_READ|PROT_WRITE, MAP_SHARED, data->fd, dev->base_addr[1]+0x8000 );

	if (data->memory == MAP_FAILED) {
		perror(_("via_open: mmap failed"));
		via_close(via_card);
		return 0;
	}
	
	char* PCIO = data->memory;

	// Note: There is a third bus, which uses the GPIO bits. This one is not supported here!

	via_card->nbusses = 2;
	via_card->i2c_busses = malloc(2*sizeof(struct i2c_algo_bit_data));
	init_i2c_bus(&via_card->i2c_busses[0], PCIO, 0x26);
	init_i2c_bus(&via_card->i2c_busses[1], PCIO, 0x31);
	
	return via_card;
}

void via_close(struct card* via_card)
{
	int i;
	
	if (via_card->data) {
		struct mem_data* data = via_card->data;
		if ((data->memory) && (data->memory == MAP_FAILED) && (data->length)) {
			munmap(data->memory, data->length);
		}
		free(via_card->data);
	}
	
	for (i = 0; i < via_card->nbusses; i++) {
		free((&via_card->i2c_busses[i])->data);
	}
	
	free(via_card->i2c_busses);
	
	free(via_card);
}


Index: Makefile.am
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddcpci/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	13 Sep 2005 21:28:04 -0000	1.7
+++ Makefile.am	3 Mar 2006 21:08:57 -0000	1.8
@@ -2,7 +2,7 @@
 
 bin_PROGRAMS = ddcpci
 ddcpci_LDFLAGS = -Wl,-z,now
-ddcpci_SOURCES = main.c nvidia.c radeon.c i2c-algo-bit.c intel810.c ddcpci.h i2c-algo-bit.h
+ddcpci_SOURCES = main.c nvidia.c radeon.c i2c-algo-bit.c intel810.c ddcpci.h i2c-algo-bit.h via.c sis.c
 
 install-exec-hook:
 	chmod 4711 ${DESTDIR}/${bindir}/ddcpci

Index: ddcpci.h
===================================================================
RCS file: /cvsroot/ddccontrol/ddccontrol/src/ddcpci/ddcpci.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ddcpci.h	14 Feb 2006 19:32:48 -0000	1.10
+++ ddcpci.h	3 Mar 2006 21:08:57 -0000	1.11
@@ -56,4 +56,13 @@
 struct card* i810_open (struct pci_dev *dev);
 void         i810_close(struct card* intel810_card);
 
+/* Via Unichrome functions */
+
+struct card* via_open(struct pci_dev*dev);
+void	     via_close(struct card* via_card);
+
+/* SIS functions */
+struct card* sis_open(struct pci_dev*dev);
+void	     sis_close(struct card* sis_card);
+
 #endif //DDCPCI_H





[ddccontrol-cvs] ddccontrol/src/ddcpci sis.c,NONE,1.1 via.c,NONE,1.1 Makefile.am,1.7,1.8 ddcpci.h,1.

[ddccontrol-cvs] ddccontrol/src/ddcpci sis.c,NONE,1.1 via.c,NONE,1.1 Makefile.am,1.7,1.8 ddcpci.h,1.10,1.11 main.c,1.16,1.17