From: ppisa <ppisa>
Date: Sun, 6 Jun 2004 10:17:11 +0000 (+0000)
Subject: Changed data size from byte to unsigned for write_register indirect call
X-Git-Tag: CLT_COMM_CAN-pre_locking_udate~9
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/commitdiff_plain/c61a955168179d9b11a8f420979eed5cc24869c0

Changed data size from byte to unsigned for write_register indirect call
This is required for the support of the cards connected to the wider
bus architecture. This should not have negative impact, because
char has been propagated to int by C call convention anyway.
The global inline canobj_write_reg function has been left intact
(byte only), because it could better optimize for static call case.
---

diff --git a/lincan/include/aim104.h b/lincan/include/aim104.h
index c269114..b8d2366 100644
--- a/lincan/include/aim104.h
+++ b/lincan/include/aim104.h
@@ -13,7 +13,7 @@ int aim104_reset(struct candevice_t *candev);
 int aim104_init_hw_data(struct candevice_t *candev);
 int aim104_init_chip_data(struct candevice_t *candev, int chipnr);
 int aim104_init_obj_data(struct chip_t *chip, int objnr);
-void aim104_write_register(unsigned char data, unsigned long address);
+void aim104_write_register(unsigned data, unsigned long address);
 unsigned aim104_read_register(unsigned long address);
 int aim104_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/c_can.h b/lincan/include/c_can.h
index 4955d86..8e72da4 100644
--- a/lincan/include/c_can.h
+++ b/lincan/include/c_can.h
@@ -9,41 +9,28 @@
  * Version lincan-0.2  9 Jul 2003
  */
 
-void hms30c7202_write_reg_w(const struct chip_t *pchip, u16 data, unsigned reg);
-
-u16 hms30c7202_read_reg_w(const struct chip_t *pchip, unsigned reg);
-
-#ifndef CONFIG_OC_LINCAN_DYNAMICIO
 /* 
  * optimized inline version, may it be, that it can be too fast for the chip
  */
 extern inline void c_can_write_reg_w(const struct chip_t *pchip, u16 data, unsigned reg)
 {
 	u32 address = pchip->chip_base_addr + reg;
+    #ifndef CONFIG_OC_LINCAN_DYNAMICIO
 	writew(data,address);
+    #else /*CONFIG_OC_LINCAN_DYNAMICIO*/
+	pchip->write_register(data, address);
+    #endif /*CONFIG_OC_LINCAN_DYNAMICIO*/
 }
 
 extern inline u16 c_can_read_reg_w(const struct chip_t *pchip, unsigned reg)
 {
 	u32 address = pchip->chip_base_addr + reg;
+    #ifndef CONFIG_OC_LINCAN_DYNAMICIO
 	return readw(address);
+    #else /*CONFIG_OC_LINCAN_DYNAMICIO*/
+	return pchip->read_register(address);
+    #endif /*CONFIG_OC_LINCAN_DYNAMICIO*/
 }
-#else /*CONFIG_OC_LINCAN_DYNAMICIO*/
-/* 
- * the standard routines for register access cannot be used,
- * because they work only with 8-bit peripherals
- */
-
-extern inline void c_can_write_reg_w(const struct chip_t *pchip, u16 data, unsigned reg)
-{
-	hms30c7202_write_reg_w(pchip, data, reg);
-}
-
-extern inline u16 c_can_read_reg_w(const struct chip_t *pchip, unsigned reg)
-{
-	return hms30c7202_read_reg_w(pchip, reg);
-}
-#endif /*CONFIG_OC_LINCAN_DYNAMICIO*/
 
 extern can_spinlock_t c_can_spwlock; // Spin lock for write operations
 extern can_spinlock_t c_can_sprlock; // Spin lock for read operations
diff --git a/lincan/include/cc_can104.h b/lincan/include/cc_can104.h
index c557f5c..ccfb840 100644
--- a/lincan/include/cc_can104.h
+++ b/lincan/include/cc_can104.h
@@ -13,7 +13,7 @@ int cc104_reset(struct candevice_t *candev);
 int cc104_init_hw_data(struct candevice_t *candev);
 int cc104_init_chip_data(struct candevice_t *candev, int chipnr);
 int cc104_init_obj_data(struct chip_t *chip, int objnr);
-void cc104_write_register(unsigned char data, unsigned long address);
+void cc104_write_register(unsigned data, unsigned long address);
 unsigned cc104_read_register(unsigned long address);
 int cc104_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/hms30c7202_can.h b/lincan/include/hms30c7202_can.h
index 25ce632..5f113ff 100644
--- a/lincan/include/hms30c7202_can.h
+++ b/lincan/include/hms30c7202_can.h
@@ -17,8 +17,8 @@ int hms30c7202_init_chip_data(struct candevice_t *candev, int chipnr);
 int hms30c7202_request_io(struct candevice_t *candev);
 int hms30c7202_release_io(struct candevice_t *candev);
 int hms30c7202_reset(  struct candevice_t *candev);
-void hms30c7202_write_reg_w(const struct chip_t *pchip, u16 data, unsigned reg);
-u16 hms30c7202_read_reg_w(const struct chip_t *pchip, unsigned reg);
+void hms30c7202_write_register(unsigned data, unsigned long address);
+unsigned hms30c7202_read_register(unsigned long address);
 
 
 
diff --git a/lincan/include/m437.h b/lincan/include/m437.h
index 2c77bd3..c2edd18 100644
--- a/lincan/include/m437.h
+++ b/lincan/include/m437.h
@@ -15,7 +15,7 @@ int m437_reset(struct candevice_t *candev);
 int m437_init_hw_data(struct candevice_t *candev);
 int m437_init_chip_data(struct candevice_t *candev, int chipnr);
 int m437_init_obj_data(struct chip_t *chip, int objnr);
-void m437_write_register(unsigned char data, unsigned long address);
+void m437_write_register(unsigned data, unsigned long address);
 unsigned m437_read_register(unsigned long address);
 int m437_program_irq(struct candevice_t *candev);
 int m437_register(struct hwspecops_t *hwspecops);
diff --git a/lincan/include/main.h b/lincan/include/main.h
index cc426b4..30ae627 100644
--- a/lincan/include/main.h
+++ b/lincan/include/main.h
@@ -158,7 +158,7 @@ struct chip_t {
 	long clock; /* Chip clock in Hz */
 	long baudrate;
 
-	void (*write_register)(unsigned char data,unsigned long address);
+	void (*write_register)(unsigned data,unsigned long address);
 	unsigned (*read_register)(unsigned long address);
 	
 	void *chip_data;
@@ -297,7 +297,7 @@ struct hwspecops_t {
 	int (*init_chip_data)(struct candevice_t *candev, int chipnr);
 	int (*init_obj_data)(struct chip_t *chip, int objnr);
 	int (*program_irq)(struct candevice_t *candev);
-	void (*write_register)(unsigned char data,unsigned long address);
+	void (*write_register)(unsigned data,unsigned long address);
 	unsigned (*read_register)(unsigned long address);
 };
 
diff --git a/lincan/include/msmcan.h b/lincan/include/msmcan.h
index 632acac..1d7bd33 100644
--- a/lincan/include/msmcan.h
+++ b/lincan/include/msmcan.h
@@ -13,7 +13,7 @@ int msmcan_reset(struct candevice_t *candev);
 int msmcan_init_hw_data(struct candevice_t *candev);
 int msmcan_init_chip_data(struct candevice_t *candev, int chipnr);
 int msmcan_init_obj_data(struct chip_t *chip, int objnr);
-void msmcan_write_register(unsigned char data, unsigned long address);
+void msmcan_write_register(unsigned data, unsigned long address);
 unsigned msmcan_read_register(unsigned long address);
 int msmcan_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/nsi.h b/lincan/include/nsi.h
index ec6db23..8f00ae0 100644
--- a/lincan/include/nsi.h
+++ b/lincan/include/nsi.h
@@ -13,7 +13,7 @@ int nsi_reset(struct candevice_t *candev);
 int nsi_init_hw_data(struct candevice_t *candev);
 int nsi_init_chip_data(struct candevice_t *candev, int chipnr);
 int nsi_init_obj_data(struct chip_t *chip, int objnr);
-void nsi_write_register(unsigned char data, unsigned long address);
+void nsi_write_register(unsigned data, unsigned long address);
 unsigned nsi_read_register(unsigned long address);
 int nsi_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/pc-i03.h b/lincan/include/pc-i03.h
index 9b34ca3..2245e4e 100644
--- a/lincan/include/pc-i03.h
+++ b/lincan/include/pc-i03.h
@@ -13,7 +13,7 @@ int pci03_reset(struct candevice_t *candev);
 int pci03_init_hw_data(struct candevice_t *candev);
 int pci03_init_chip_data(struct candevice_t *candev, int chipnr);
 int pci03_init_obj_data(struct chip_t *chip, int objnr);
-void pci03_write_register(unsigned char data, unsigned long address);
+void pci03_write_register(unsigned data, unsigned long address);
 unsigned pci03_read_register(unsigned long address);
 int pci03_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/pccan.h b/lincan/include/pccan.h
index d47804c..45b18be 100644
--- a/lincan/include/pccan.h
+++ b/lincan/include/pccan.h
@@ -19,7 +19,7 @@ int pccanq_reset(struct candevice_t *candev);
 int pccan_init_hw_data(struct candevice_t *candev);
 int pccan_init_chip_data(struct candevice_t *candev, int chipnr);
 int pccan_init_obj_data(struct chip_t *chip, int objnr);
-void pccan_write_register(unsigned char data, unsigned long address);
+void pccan_write_register(unsigned data, unsigned long address);
 unsigned pccan_read_register(unsigned long address);
 int pccan_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/pcccan.h b/lincan/include/pcccan.h
index cf98553..2e5b55b 100644
--- a/lincan/include/pcccan.h
+++ b/lincan/include/pcccan.h
@@ -13,7 +13,7 @@ int pcccan_reset(struct candevice_t *candev);
 int pcccan_init_hw_data(struct candevice_t *candev);
 int pcccan_init_chip_data(struct candevice_t *candev, int chipnr);
 int pcccan_init_obj_data(struct chip_t *chip, int objnr);
-void pcccan_write_register(unsigned char data, unsigned long address);
+void pcccan_write_register(unsigned data, unsigned long address);
 unsigned pcccan_read_register(unsigned long address);
 int pcccan_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/pcm3680.h b/lincan/include/pcm3680.h
index 324854e..c0c5b6f 100644
--- a/lincan/include/pcm3680.h
+++ b/lincan/include/pcm3680.h
@@ -13,7 +13,7 @@ int pcm3680_reset(struct candevice_t *candev);
 int pcm3680_init_hw_data(struct candevice_t *candev);
 int pcm3680_init_chip_data(struct candevice_t *candev, int chipnr);
 int pcm3680_init_obj_data(struct chip_t *chip, int objnr);
-void pcm3680_write_register(unsigned char data, unsigned long address);
+void pcm3680_write_register(unsigned data, unsigned long address);
 unsigned pcm3680_read_register(unsigned long address);
 int pcm3680_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/pikronisa.h b/lincan/include/pikronisa.h
index 360cc08..1b8f4eb 100644
--- a/lincan/include/pikronisa.h
+++ b/lincan/include/pikronisa.h
@@ -17,6 +17,6 @@ int pikronisa_init_hw_data(struct candevice_t *candev);
 int pikronisa_init_chip_data(struct candevice_t *candev, int chipnr);
 int pikronisa_init_obj_data(struct chip_t *chip, int objnr);
 int pikronisa_program_irq(struct candevice_t *candev);
-void pikronisa_write_register(unsigned char data, unsigned long address);
+void pikronisa_write_register(unsigned data, unsigned long address);
 unsigned pikronisa_read_register(unsigned long address);
 
diff --git a/lincan/include/pip.h b/lincan/include/pip.h
index c32b2b5..cc4891f 100644
--- a/lincan/include/pip.h
+++ b/lincan/include/pip.h
@@ -13,7 +13,7 @@ int pip5_reset(struct candevice_t *candev);
 int pip5_init_hw_data(struct candevice_t *candev);
 int pip5_init_chip_data(struct candevice_t *candev, int chipnr);
 int pip5_init_obj_data(struct chip_t *chip, int objnr);
-void pip5_write_register(unsigned char data, unsigned long address);
+void pip5_write_register(unsigned data, unsigned long address);
 unsigned pip5_read_register(unsigned long address);
 int pip5_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/smartcan.h b/lincan/include/smartcan.h
index 74fa2aa..047ab4b 100644
--- a/lincan/include/smartcan.h
+++ b/lincan/include/smartcan.h
@@ -13,6 +13,6 @@ int smartcan_reset(struct candevice_t *candev);
 int smartcan_init_hw_data(struct candevice_t *candev);
 int smartcan_init_chip_data(struct candevice_t *candev, int chipnr);
 int smartcan_init_obj_data(struct chip_t *chip, int objnr);
-void smartcan_write_register(unsigned char data, unsigned long address);
+void smartcan_write_register(unsigned data, unsigned long address);
 unsigned smartcan_read_register(unsigned long address);
 
diff --git a/lincan/include/ssv.h b/lincan/include/ssv.h
index 9371487..547308e 100644
--- a/lincan/include/ssv.h
+++ b/lincan/include/ssv.h
@@ -11,7 +11,7 @@ int ssv_reset(struct candevice_t *candev);
 int ssv_init_hw_data(struct candevice_t *candev);
 int ssv_init_chip_data(struct candevice_t *candev, int chipnr);
 int ssv_init_obj_data(struct chip_t *chip, int objnr);
-void ssv_write_register(unsigned char data, unsigned long address);
+void ssv_write_register(unsigned data, unsigned long address);
 unsigned ssv_read_register(unsigned long address);
 int ssv_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/include/template.h b/lincan/include/template.h
index f61e31f..ef4b443 100644
--- a/lincan/include/template.h
+++ b/lincan/include/template.h
@@ -13,7 +13,7 @@ int template_reset(struct candevice_t *candev);
 int template_init_hw_data(struct candevice_t *candev);
 int template_init_chip_data(struct candevice_t *candev, int chipnr);
 int template_init_obj_data(struct chip_t *chip, int objnr);
-void template_write_register(unsigned char data, unsigned long address);
+void template_write_register(unsigned data, unsigned long address);
 unsigned template_read_register(unsigned long address);
 int template_program_irq(struct candevice_t *candev);
 
diff --git a/lincan/src/aim104.c b/lincan/src/aim104.c
index cc24806..1119d61 100644
--- a/lincan/src/aim104.c
+++ b/lincan/src/aim104.c
@@ -224,7 +224,7 @@ int aim104_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/template.c
  */
-void aim104_write_register(unsigned char data, unsigned long address)
+void aim104_write_register(unsigned data, unsigned long address)
 {
 	outb(data,address);
 }
diff --git a/lincan/src/bfadcan.c b/lincan/src/bfadcan.c
index c2c9ce7..3fc3064 100644
--- a/lincan/src/bfadcan.c
+++ b/lincan/src/bfadcan.c
@@ -44,7 +44,7 @@ static can_spinlock_t bfadcan_win_lock=SPIN_LOCK_UNLOCKED;
 #endif
 
 unsigned bfadcan_read_register(unsigned long address);
-void bfadcan_write_register(unsigned char data, unsigned long address);
+void bfadcan_write_register(unsigned data, unsigned long address);
 
 
 /**
@@ -270,7 +270,7 @@ int bfadcan_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/bfadcan.c
  */
-void bfadcan_write_register(unsigned char data, unsigned long address)
+void bfadcan_write_register(unsigned data, unsigned long address)
 {
 #ifdef WINDOWED_ACCESS
 	can_spin_irqflags_t flags;
diff --git a/lincan/src/cc_can104.c b/lincan/src/cc_can104.c
index 1197bcf..9f621fd 100644
--- a/lincan/src/cc_can104.c
+++ b/lincan/src/cc_can104.c
@@ -204,7 +204,7 @@ int cc104_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/template.c
  */
-void cc104_write_register(unsigned char data, unsigned long address)
+void cc104_write_register(unsigned data, unsigned long address)
 {
 	outb(data,address);
 }
diff --git a/lincan/src/ems_cpcpci.c b/lincan/src/ems_cpcpci.c
index 69d855f..ce8927e 100644
--- a/lincan/src/ems_cpcpci.c
+++ b/lincan/src/ems_cpcpci.c
@@ -123,7 +123,7 @@ int ems_cpcpci_release_io(struct candevice_t *candev)
 }
 
 
-void ems_cpcpci_write_register(unsigned char data, unsigned long address)
+void ems_cpcpci_write_register(unsigned data, unsigned long address)
 {
 	address += ((address&(EMS_CPCPCI_BYTES_PER_CIRCUIT-1))
 	                    *(EMS_CPCPCI_BYTES_PER_REG-1));
diff --git a/lincan/src/hms30c7202_can.c b/lincan/src/hms30c7202_can.c
index 2bf38aa..fc13043 100644
--- a/lincan/src/hms30c7202_can.c
+++ b/lincan/src/hms30c7202_can.c
@@ -94,7 +94,7 @@ int hms30c7202_release_io(struct candevice_t *candev)
 	u16 tempReg;
 	
 	//disable IRQ generation
-	tempReg = hms30c7202_read_reg_w(candev->chip[0], CCCR);
+	tempReg = c_can_read_reg_w(candev->chip[0], CCCR);
 
 	c_can_config_irqs(candev->chip[0], 0);
 	
@@ -155,7 +155,7 @@ int hms30c7202_reset(  struct candevice_t *candev)
 	
 	/* Check busoff status */
 	
-	while ( (hms30c7202_read_reg_w(pchip, CCSR) & SR_BOFF) && (i<=15)) {
+	while ( (c_can_read_reg_w(pchip, CCSR) & SR_BOFF) && (i<=15)) {
 		udelay(20000);
 		i++;
 	}
@@ -273,14 +273,6 @@ int hms30c7202_init_hw_data(struct candevice_t *candev)
 	candev->nr_sja1000_chips=0;
 	candev->nr_all_chips=NR_C_CAN;
 
-	// Register hardware operations
-	candev->hwspecops->request_io = hms30c7202_request_io;
-	candev->hwspecops->release_io = hms30c7202_release_io;
-	candev->hwspecops->reset = hms30c7202_reset;
-	/* private register read and write routines used */
-	candev->hwspecops->write_register = NULL; /*hms30c7202_write_register;*/
-	candev->hwspecops->read_register = NULL; /*hms30c7202_read_register;*/
-
 	return 0;
 }
 
@@ -359,17 +351,16 @@ int hms30c7202_init_obj_data(struct chip_t *chip, int objnr)
  * File: src/template.c
  */
 
-void hms30c7202_write_reg_w(const struct chip_t *pchip, u16 data, unsigned reg)
+void hms30c7202_write_register(unsigned data, unsigned long address)
 {
-   int i;
-   u32 address = pchip->chip_base_addr + reg;
+	int i;
 	//unsigned long usecs = 1;
-
-   //DEBUGMSG("Trying to write 0x%u16x to address 0x%lx\n",data,address);
-
-   writew(data,address);
+	
+	//DEBUGMSG("Trying to write 0x%u16x to address 0x%lx\n",data,address);
+	
+	writew(data,address);
 	//udelay( usecs );
-   for (i=0; i<5; i++);
+	for (i=0; i<5; i++);
 }
 
 /**
@@ -382,23 +373,21 @@ void hms30c7202_write_reg_w(const struct chip_t *pchip, u16 data, unsigned reg)
  * Return Value: The function returns the value stored in @address
  * File: src/template.c
  */
-u16 hms30c7202_read_reg_w(const struct chip_t *pchip, unsigned reg)
+unsigned hms30c7202_read_register(unsigned long address)
 {
-   u16 value, i;
-   u32 address = pchip->chip_base_addr + reg;
-	//unsigned long usecs = 1;
-
-   //DEBUGMSG("Trying to read from address 0x%lx :",address);
-
-   value = readw(address);
-   //udelay( usecs );
-   for (i=0;i<5;i++);
-   value = readw(address);
+	u16 value, i;
+	
+	//DEBUGMSG("Trying to read from address 0x%lx :",address);
+	
+	value = readw(address);
 	//udelay( usecs );
-   for (i=0;i<5;i++);
-
-   //DEBUGMSG("0x%u16x\n",value);
-   return value;
+	for (i=0;i<5;i++);
+	value = readw(address);
+		//udelay( usecs );
+	for (i=0;i<5;i++);
+	
+	//DEBUGMSG("0x%u16x\n",value);
+	return value;
 
 }
 
@@ -427,9 +416,8 @@ int hms30c7202_register(struct hwspecops_t *hwspecops)
 	hwspecops->init_hw_data = hms30c7202_init_hw_data;
 	hwspecops->init_chip_data = hms30c7202_init_chip_data;
 	hwspecops->init_obj_data = hms30c7202_init_obj_data;
-	/* private register read and write routines used */
-	hwspecops->write_register = NULL; /*hms30c7202_write_register;*/
-	hwspecops->read_register = NULL; /*hms30c7202_read_register;*/
+	hwspecops->write_register = hms30c7202_write_register;
+	hwspecops->read_register = hms30c7202_read_register;
 	hwspecops->program_irq = hms30c7202_program_irq;
 	return 0;
 }
diff --git a/lincan/src/kv_pcican.c b/lincan/src/kv_pcican.c
index e7f36e3..2b9893e 100644
--- a/lincan/src/kv_pcican.c
+++ b/lincan/src/kv_pcican.c
@@ -121,7 +121,7 @@ int kv_pcican_release_io(struct candevice_t *candev)
 }
 
 
-void kv_pcican_write_register(unsigned char data, unsigned long address)
+void kv_pcican_write_register(unsigned data, unsigned long address)
 {
 	outb(data,address); 
 }
diff --git a/lincan/src/m437.c b/lincan/src/m437.c
index 37308b2..eb6a330 100644
--- a/lincan/src/m437.c
+++ b/lincan/src/m437.c
@@ -261,7 +261,7 @@ int m437_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/m437.c
  */
-void m437_write_register(unsigned char data, unsigned long address)
+void m437_write_register(unsigned data, unsigned long address)
 {
 	writeb(data,base+address);
 }
diff --git a/lincan/src/msmcan.c b/lincan/src/msmcan.c
index 1d6fb51..0cdb07d 100644
--- a/lincan/src/msmcan.c
+++ b/lincan/src/msmcan.c
@@ -173,7 +173,7 @@ int msmcan_program_irq(struct candevice_t *candev)
  * on the CAN chip. You should only have to edit this function if your hardware
  * uses some specific write process.
  */
-void msmcan_write_register(unsigned char data, unsigned long address)
+void msmcan_write_register(unsigned data, unsigned long address)
 {
 	/* address is combination of base address shifted left by 16 and index */
 	can_spin_irqflags_t flags;
diff --git a/lincan/src/nsi.c b/lincan/src/nsi.c
index 03ba230..1ac0793 100644
--- a/lincan/src/nsi.c
+++ b/lincan/src/nsi.c
@@ -170,7 +170,7 @@ int nsi_program_irq(struct candevice_t *candev)
  * on the CAN chip. You should only have to edit this function if your hardware
  * uses some specific write process.
  */
-void nsi_write_register(unsigned char data, unsigned long address)
+void nsi_write_register(unsigned data, unsigned long address)
 {
     /* address is an absolute address */
 
diff --git a/lincan/src/pc_i03.c b/lincan/src/pc_i03.c
index d926e33..c7b3863 100644
--- a/lincan/src/pc_i03.c
+++ b/lincan/src/pc_i03.c
@@ -231,7 +231,7 @@ int pci03_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/pc-i03.c
  */
-void pci03_write_register(unsigned char data, unsigned long address)
+void pci03_write_register(unsigned data, unsigned long address)
 {
 	unsigned int *pci03_base_ptr;
 	unsigned short address_to_write;
diff --git a/lincan/src/pccan.c b/lincan/src/pccan.c
index 6e32610..57dcd3c 100644
--- a/lincan/src/pccan.c
+++ b/lincan/src/pccan.c
@@ -338,7 +338,7 @@ int pccan_program_irq(struct candevice_t *candev)
 	return 0;
 }
 
-inline void pccan_write_register(unsigned char data, unsigned long address)
+inline void pccan_write_register(unsigned data, unsigned long address)
 {
 	outb(data,address); 
 }
diff --git a/lincan/src/pcccan.c b/lincan/src/pcccan.c
index ebf315c..b940731 100644
--- a/lincan/src/pcccan.c
+++ b/lincan/src/pcccan.c
@@ -253,7 +253,7 @@ int pcccan_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/pcccan.c
  */
-void pcccan_write_register(unsigned char data, unsigned long address)
+void pcccan_write_register(unsigned data, unsigned long address)
 {
 	can_spin_irqflags_t flags;
 	can_spin_lock_irqsave(&pcccan_port_lock,flags);
diff --git a/lincan/src/pcm3680.c b/lincan/src/pcm3680.c
index 2d17861..43b58f6 100644
--- a/lincan/src/pcm3680.c
+++ b/lincan/src/pcm3680.c
@@ -237,7 +237,7 @@ int pcm3680_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/template.c
  */
-void pcm3680_write_register(unsigned char data, unsigned long address)
+void pcm3680_write_register(unsigned data, unsigned long address)
 {
 	writeb(data,address);
 }
diff --git a/lincan/src/pikronisa.c b/lincan/src/pikronisa.c
index 5778875..a102ab0 100644
--- a/lincan/src/pikronisa.c
+++ b/lincan/src/pikronisa.c
@@ -243,7 +243,7 @@ int pikronisa_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/pikronisa.c
  */
-void pikronisa_write_register(unsigned char data, unsigned long address)
+void pikronisa_write_register(unsigned data, unsigned long address)
 {
 	/*DEBUGMSG("pikronisa_write_register: addr=0x%lx data=0x%x",
 		address,data);*/
diff --git a/lincan/src/pip.c b/lincan/src/pip.c
index 16c0098..f031a73 100644
--- a/lincan/src/pip.c
+++ b/lincan/src/pip.c
@@ -197,7 +197,7 @@ int pip6_program_irq(struct candevice_t *candev)
 	return 0;
 }
 
-void pip_write_register(unsigned char data, unsigned long address)
+void pip_write_register(unsigned data, unsigned long address)
 {
 	outb(data,address);
 }
diff --git a/lincan/src/smartcan.c b/lincan/src/smartcan.c
index 4d638f9..4abbc9c 100644
--- a/lincan/src/smartcan.c
+++ b/lincan/src/smartcan.c
@@ -100,7 +100,7 @@ int smartcan_init_obj_data(struct chip_t *chip, int objnr)
 }
 
 
-void smartcan_write_register(unsigned char data, unsigned long address)
+void smartcan_write_register(unsigned data, unsigned long address)
 {
 	can_spin_irqflags_t flags;
 	can_spin_lock_irqsave(&smartcan_port_lock,flags);
diff --git a/lincan/src/ssv.c b/lincan/src/ssv.c
index 802aee7..6f1b585 100644
--- a/lincan/src/ssv.c
+++ b/lincan/src/ssv.c
@@ -185,7 +185,7 @@ int ssv_program_irq(struct candevice_t *candev)
  * on the CAN chip. You should only have to edit this function if your hardware
  * uses some specific write process.
  */
-void ssv_write_register(unsigned char data, unsigned long address)
+void ssv_write_register(unsigned data, unsigned long address)
 {
     /* address is an absolute address */
 
diff --git a/lincan/src/template.c b/lincan/src/template.c
index f530228..6f49e8d 100644
--- a/lincan/src/template.c
+++ b/lincan/src/template.c
@@ -214,7 +214,7 @@ int template_program_irq(struct candevice_t *candev)
  * Return Value: The function does not return a value
  * File: src/template.c
  */
-void template_write_register(unsigned char data, unsigned long address)
+void template_write_register(unsigned data, unsigned long address)
 {
 	outb(data,address);
 }