X-Git-Url: http://rtime.felk.cvut.cz/gitweb/linux-lin.git/blobdiff_plain/27e6d6f028fb37070fcfbed9c6b68f2161740bfb..08d7decec20c866383493ae9f217f88e97003be0:/lin_config/src/pcl_config.c diff --git a/lin_config/src/pcl_config.c b/lin_config/src/pcl_config.c index 61e07e2..503f1d5 100644 --- a/lin_config/src/pcl_config.c +++ b/lin_config/src/pcl_config.c @@ -320,8 +320,8 @@ int pcl_lin_init(int tty, struct linc_lin_state *linc_lin_state) pkt.seq_frlen = 0x2; pkt.ctrl_tiface = PCL_PACKET_LIN_IFACE; pkt.ctrl_comc = 0x1F; - pkt.parms[0] = 0x00; - pkt.parms[1] = 0x4B; /* 19200 kBit/s */ + pkt.parms[0] = pcl_lin_state.baudrate & 0xFF; + pkt.parms[1] = (pcl_lin_state.baudrate >> 8) & 0xFF; pcl_send_frame(tty, &pkt); pcl_read_response(tty); @@ -420,7 +420,7 @@ int pcl_lin_init(int tty, struct linc_lin_state *linc_lin_state) return 0; } -int pcl_config(struct linc_lin_state *linc_lin_state, unsigned int flags) +int pcl_config(struct linc_lin_state *linc_lin_state) { int tty; @@ -433,22 +433,24 @@ int pcl_config(struct linc_lin_state *linc_lin_state, unsigned int flags) pcl_set_input_mode(tty); - if (flags & RESET_DEVICE_fl) { + if (linc_lin_state->flags & RESET_DEVICE_fl) { pcl_reset_device(tty); return 0; } pcl_lin_init(tty, linc_lin_state); - if (flags & FLASH_CONF_fl) { + if (linc_lin_state->flags & FLASH_CONF_fl) { pcl_flash_config(tty); pcl_reset_device(tty); } + // FIXME add warning on unrecognized flags + //if (flags & (RESET_DEVICE_fl | FLASH_CONF_fl)) + pcl_reset_input_mode(tty); close(tty); return 0; } -