#include "../include/can_sysdep.h"
#include "../include/main.h"
#include "../include/open.h"
-#include "../include/i82527.h"
#include "../include/setup.h"
#define __NO_VERSION__
int can_open(struct inode *inode, struct file *file)
{
struct msgobj_t *obj;
- struct chip_t *chip;
+ struct canchip_t *chip;
struct canuser_t *canuser;
struct canque_ends_t *qends;
struct canque_edge_t *edge;
can_spin_irqflags_t iflags;
+ char openflag; // Martin Petera: Object already opened
if ( ((obj=objects_p[MINOR_NR]) == NULL) ||
((chip=objects_p[MINOR_NR]->hostchip) == NULL) ) {
atomic_inc(&obj->obj_used);
DEBUGMSG("Device %d opened %d times.\n", MINOR_NR, atomic_read(&obj->obj_used));
+ openflag = can_msgobj_test_fl(obj,OPENED); // Martin Petera: store previous status
can_msgobj_set_fl(obj,OPENED);
if (chip->flags & CHIP_CONFIGURED)
CANMSG("Error configuring chip.\n");
else
chip->flags |= CHIP_CONFIGURED;
+ } /* End of chip configuration */
+
+ /* Martin Petera: Fix for HCAN2
+ * pre_read was called only once -> Opening second MSG object from userspace
+ * didn't call function to configure MSG object for receive.
+ * FIX: Call pre_read once for each MSG object
+ **/
+ if (!openflag) {
if (chip->chipspecops->pre_read_config(chip,obj)<0)
CANMSG("Error initializing chip for receiving\n");
+ }
- } /* End of chip configuration */
canuser = (struct canuser_t *)kmalloc(sizeof(struct canuser_t), GFP_KERNEL);
if(canuser == NULL) goto no_canuser;