X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/cb551cc1582f3b51cf17e80730bee3c2f0701c3f..c61a955168179d9b11a8f420979eed5cc24869c0:/lincan/src/hms30c7202_can.c

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;
 }