X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/1fd6ebf194739bee96aa5696cdd24622ef658130..92b76dca553a98a228f368f8ff6eedc25e33b870:/lincan/src/ioctl.c

diff --git a/lincan/src/ioctl.c b/lincan/src/ioctl.c
index 4cf3ca5..0c11ebd 100644
--- a/lincan/src/ioctl.c
+++ b/lincan/src/ioctl.c
@@ -66,21 +66,6 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
 			break;
 		}
 		case CONF_FILTER: {
-		    #if 0
-			if (!strcmp(chip->chip_type,"i82527")) {
-			
-				unsigned char id1, id0;
-				id1 = (unsigned char) (arg << 5);
-				id0 = (unsigned char) (arg >> 3);
-
-				DEBUGMSG("configuring ID=%lx in message object:"
-					" %02x, %02x\n", arg, id0, id1);
-				can_write_reg(chip,id1,MSG_OFFSET(obj->object) +
-								iMSGID1);
-				can_write_reg(chip,id0,MSG_OFFSET(obj->object) +
-								iMSGID0);
-			}
-		    #endif
 
 			/* In- and output buffer re-initialization */
 			
@@ -111,6 +96,25 @@ int can_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned
 			}
 			break;
 		}
+		
+		case CONF_BAUDPARAMS: {
+			struct can_baudparams_t params;
+			copy_from_user(&params, (void*)arg, sizeof(struct can_baudparams_t));
+			if(params.flags == -1) params.flags = 0;
+			if(params.baudrate == -1) params.baudrate = chip->baudrate;
+			if(params.sjw == -1) params.sjw = 0;
+			if(params.sample_pt == -1) params.sample_pt = 75;
+			i=chip->chipspecops->baud_rate(chip, params.baudrate, chip->clock, params.sjw,
+                                                        params.sample_pt, params.flags);
+			if(i>=0) chip->baudrate = params.baudrate;
+			else {
+				CANMSG("Error setting baud parameters\n");
+				return -1;
+			}
+			break;
+		}
+
+
 		default: {
 			CANMSG("Not a valid ioctl command\n");
 			return -EINVAL;