* Rewritten for new CAN queues by Pavel Pisa - OCERA team member
* email:pisa@cmp.felk.cvut.cz
* This software is released under the GPL-License.
- * Version lincan-0.2 9 Jul 2003
+ * Version lincan-0.3 17 Jun 2004
*/
#include <linux/delay.h>
*/
int hms30c7202_request_io(struct candevice_t *candev)
{
- DEBUGMSG("(c%d)calling hms30c7202_request_io(...)\n", pchip->chip_nr);
+ DEBUGMSG("(c%d)calling hms30c7202_request_io(...)\n", candev->chip[0]->chip_idx);
if(!can_request_mem_region(candev->io_addr, IO_RANGE, DEVICE_NAME )) {
CANMSG("hmsc30c7202_can failed to request mem region %lx.\n",
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);
{
int i=0;
int enableTest=0, disableTest=0;
- struct chip_t *pchip = candev->chip[0];
+ struct canchip_t *pchip = candev->chip[0];
enableTest = pchip->chipspecops->enable_configuration(pchip);
disableTest = pchip->chipspecops->disable_configuration(pchip);
/* 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++;
}
* File: src/template.c
*/
int hms30c7202_init_hw_data(struct candevice_t *candev)
-/*( struct chip_t *pchip, u16 chip_nr, u16 startminor, u32 baseaddr, u8 irq )*/
+/*( struct canchip_t *pchip, u16 chip_nr, u16 startminor, u32 baseaddr, u8 irq )*/
{
// u32 intCntrVAddr = 0;
u32 gpioVAddr = 0;
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;
}
*/
int hms30c7202_init_chip_data(struct candevice_t *candev, int chipnr)
{
- candev->chip[chipnr]->chip_type=CHIP_TYPE;
+ // Register chip operations
+ c_can_fill_chipspecops(candev->chip[chipnr]);
+ /* override chip provided default value */
+ candev->chip[chipnr]->max_objects = NR_MSGOBJ;
+
candev->chip[chipnr]->chip_base_addr=candev->io_addr;
- candev->chip[chipnr]->clock = 16000000;
-
- candev->chip[chipnr]->max_objects = NR_MSGOBJ;
+ candev->chip[chipnr]->clock = 16000000/2;
/*candev->chip[chipnr]->int_clk_reg = 0x0;
candev->chip[chipnr]->int_bus_reg = 0x0;
candev->chip[chipnr]->sja_cdr_reg = 0x0;
candev->chip[chipnr]->sja_ocr_reg = 0x0;*/
- // Register chip operations
- c_can_register(candev->chip[chipnr]->chipspecops);
return 0;
}
* Return Value: The function always returns zero
* File: src/template.c
*/
-int hms30c7202_init_obj_data(struct chip_t *chip, int objnr)
+int hms30c7202_init_obj_data(struct canchip_t *chip, int objnr)
{
- DEBUGMSG("(c%d)calling hms30c7202_init_obj_data( ...)\n", pchip->chip_nr);
+ DEBUGMSG("(c%d)calling hms30c7202_init_obj_data( ...)\n", chip->chip_idx);
/* It seems, that there is no purpose to setup object base address */
chip->msgobj[objnr]->obj_base_addr=0;
* @address: memory address to write to
*
* The function hms30c7202_write_register() is used to write to hardware registers
- * on the CAN chip. You should only have to edit this function if your hardware
- * uses some specific write process.
+ * on the CAN chip. The registers are mapped on 32 bit bus on hms30c7202
+ * and thus registers span is twice as one defined by C_CAN manual and defines.
+ * This function compensates this difference.
* Return Value: The function does not return a value
* 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);
+ address = ((address & C_CAN_REGOFFS_MASK) << 1) |
+ (address & ~C_CAN_REGOFFS_MASK);
+
+ //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++);
}
/**
* @address: memory address to read from
*
* The function hms30c7202_read_register() is used to read from hardware registers
- * on the CAN chip. You should only have to edit this function if your hardware
- * uses some specific read process.
+ * on the CAN chip. The registers are mapped on 32 bit bus on hms30c7202
+ * and thus registers span is twice as one defined by C_CAN manual and defines.
+ * This function compensates this difference.
* 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);
+ u16 value, i;
+
+ address = ((address & C_CAN_REGOFFS_MASK) << 1) |
+ (address & ~C_CAN_REGOFFS_MASK);
- value = readw(address);
- //udelay( usecs );
- for (i=0;i<5;i++);
- value = readw(address);
+ //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;
}
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;
}
projects / lincan.git / blobdiff