* 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 "../include/can.h"
#include "../include/can_sysdep.h"
#include "../include/main.h"
#include "../include/ioctl.h"
-#include "../include/i82527.h"
int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
{
unsigned btr0=0, btr1=0;
struct canuser_t *canuser = (struct canuser_t*)(file->private_data);
struct msgobj_t *obj;
- struct chip_t *chip;
+ struct canchip_t *chip;
struct canque_ends_t *qends;
if(!canuser || (canuser->magic != CAN_USER_MAGIC)){
case CANQUE_FILTER: {
struct canfilt_t canfilt;
- copy_from_user(&canfilt, (void*)arg, sizeof(struct canfilt_t));
+ int ret;
+ ret = copy_from_user(&canfilt, (void*)arg, sizeof(struct canfilt_t));
+ if(ret) return -EFAULT;
if(canuser->rx_edge0){
canque_set_filt(canuser->rx_edge0, canfilt.id, canfilt.mask, canfilt.flags);
}
break;
}
+
+ case CANRTR_READ: {
+ int ret;
+ struct canmsg_t rtr_msg;
+
+ ret = copy_from_user(&rtr_msg, (void*)arg, sizeof(struct canmsg_t));
+ if(ret) return -EFAULT;
+ ret = can_ioctl_remote_read(canuser, &rtr_msg, rtr_msg.id, 0);
+ if(ret<0) return ret;
+ ret = copy_to_user((void*)arg, &rtr_msg, sizeof(struct canmsg_t));
+ if(ret) return -EFAULT;
+ break;
+ }
case CONF_BAUD: {
channel = arg & 0xff;
case CONF_BAUDPARAMS: {
struct can_baudparams_t params;
- copy_from_user(¶ms, (void*)arg, sizeof(struct can_baudparams_t));
+ int ret;
+
+ ret = copy_from_user(¶ms, (void*)arg, sizeof(struct can_baudparams_t));
+ if(ret) return -EFAULT;
+
if(params.flags == -1) params.flags = 0;
if(params.baudrate == -1) params.baudrate = chip->baudrate;
if(params.sjw == -1) params.sjw = 0;