etherlabmaster: comparison master/fsm

equal deleted inserted replaced

-:23d4e121faaf
+:219be3742274
 /*****************************************************************************/
 /** Constructor.
 */
 void ec_fsm_soe_init(
-		ec_fsm_soe_t *fsm, /**< finite state machine */
+ec_fsm_soe_t *fsm, /**< finite state machine */
-		ec_datagram_t *datagram /**< datagram */
+ec_datagram_t *datagram /**< datagram */
-		)
+)
 {
 fsm->state = NULL;
 fsm->datagram = datagram;
 }
 /*****************************************************************************/
 /** Destructor.
 */
 void ec_fsm_soe_clear(
-		ec_fsm_soe_t *fsm /**< finite state machine */
+ec_fsm_soe_t *fsm /**< finite state machine */
-		)
+)
 {
 }
 /*****************************************************************************/
 {
 fsm->slave = slave;
 fsm->request = request;
 if (request->dir == EC_DIR_OUTPUT) {
 fsm->state = ec_fsm_soe_write_start;
-	} else {
+} else {
 fsm->state = ec_fsm_soe_read_start;
-	}
+}
 }
 /*****************************************************************************/
 /**
 fsm->state = ec_fsm_soe_error;
 return;
 }
 data = ec_slave_mbox_prepare_send(slave, datagram, EC_MBOX_TYPE_SOE,
-			EC_SOE_READ_REQUEST_SIZE);
+EC_SOE_READ_REQUEST_SIZE);
 if (IS_ERR(data)) {
 fsm->state = ec_fsm_soe_error;
 return;
 }
 }
 if (datagram->working_counter != 1) {
 fsm->state = ec_fsm_soe_error;
 EC_ERR("Reception of SoE mailbox check datagram failed on slave %u: ",
-				slave->ring_position);
+slave->ring_position);
 ec_datagram_print_wc_error(datagram);
 return;
 }
 if (!ec_slave_mbox_check(datagram)) {
 }
 if (rec_size < EC_SOE_READ_RESPONSE_SIZE) {
 fsm->state = ec_fsm_soe_error;
 EC_ERR("Received currupted SoE read response (%zu bytes)!\n",
-				rec_size);
+rec_size);
 ec_print_data(data, rec_size);
 return;
 }
 header = EC_READ_U8(data);
-	opcode = header & 0x7;
+opcode = header & 0x7;
 incomplete = (header >> 3) & 1;
-	error_flag = (header >> 4) & 1;
+error_flag = (header >> 4) & 1;
 if (opcode != EC_SOE_OPCODE_READ_RESPONSE) {
 EC_ERR("Received no read response (opcode %x).\n", opcode);
 ec_print_data(data, rec_size);
 fsm->state = ec_fsm_soe_error;
 return;
 }
-	if (error_flag) {
+if (error_flag) {
-		req->error_code = EC_READ_U16(data + rec_size - 2);
+req->error_code = EC_READ_U16(data + rec_size - 2);
-		EC_ERR("Received error response: 0x%04x.\n",
+EC_ERR("Received error response: 0x%04x.\n",
-				req->error_code);
+req->error_code);
 fsm->state = ec_fsm_soe_error;
 return;
-	} else {
+} else {
-		req->error_code = 0x0000;
+req->error_code = 0x0000;
-	}
+}
-	value_included = (EC_READ_U8(data + 1) >> 6) & 1;
+value_included = (EC_READ_U8(data + 1) >> 6) & 1;
-	if (!value_included) {
+if (!value_included) {
-		EC_ERR("No value included!\n");
+EC_ERR("No value included!\n");
-		fsm->state = ec_fsm_soe_error;
+fsm->state = ec_fsm_soe_error;
-		return;
+return;
-	}
+}
-	data_size = rec_size - EC_SOE_READ_RESPONSE_SIZE;
+data_size = rec_size - EC_SOE_READ_RESPONSE_SIZE;
-	if (ec_soe_request_append_data(req,
+if (ec_soe_request_append_data(req,
 data + EC_SOE_READ_RESPONSE_SIZE, data_size)) {
-		fsm->state = ec_fsm_soe_error;
+fsm->state = ec_fsm_soe_error;
-		return;
+return;
-	}
+}
 if (incomplete) {
 if (master->debug_level) {
 EC_DBG("SoE data incomplete. Waiting for fragment"
 " at offset %zu.\n", req->data_size);
 if (remaining_size % fragment_size) {
 fragments_left++;
 }
 data = ec_slave_mbox_prepare_send(slave, datagram, EC_MBOX_TYPE_SOE,
-			EC_SOE_WRITE_REQUEST_SIZE + fragment_size);
+EC_SOE_WRITE_REQUEST_SIZE + fragment_size);
 if (IS_ERR(data)) {
 fsm->state = ec_fsm_soe_error;
 return;
 }
 EC_WRITE_U8(data, EC_SOE_OPCODE_WRITE_REQUEST | incomplete << 3);
 EC_WRITE_U8(data + 1, 1 << 6); // only value included
 EC_WRITE_U16(data + 2, incomplete ? fragments_left : req->idn);
-	memcpy(data + 4, req->data + fsm->offset, fragment_size);
+memcpy(data + 4, req->data + fsm->offset, fragment_size);
 fsm->offset += fragment_size;
 if (master->debug_level) {
 EC_DBG("SCC write request:\n");
 ec_print_data(data, EC_SOE_WRITE_REQUEST_SIZE + fragment_size);
 }
 if (datagram->working_counter != 1) {
 fsm->state = ec_fsm_soe_error;
 EC_ERR("Reception of SoE write request datagram failed on slave %u: ",
-				slave->ring_position);
+slave->ring_position);
 ec_datagram_print_wc_error(datagram);
 return;
 }
 if (fsm->offset < req->data_size) {
 ec_datagram_t *datagram = fsm->datagram;
 ec_slave_t *slave = fsm->slave;
 ec_master_t *master = slave->master;
 ec_soe_request_t *req = fsm->request;
 uint8_t *data, mbox_prot, opcode, error_flag;
-	uint16_t idn;
+uint16_t idn;
 size_t rec_size;
 if (datagram->state == EC_DATAGRAM_TIMED_OUT && fsm->retries--)
 return; // FIXME: request again?
 }
 if (rec_size < EC_SOE_WRITE_RESPONSE_SIZE) {
 fsm->state = ec_fsm_soe_error;
 EC_ERR("Received currupted SoE write response (%zu bytes)!\n",
-				rec_size);
+rec_size);
 ec_print_data(data, rec_size);
 return;
 }
-	opcode = EC_READ_U8(data) & 0x7;
+opcode = EC_READ_U8(data) & 0x7;
 if (opcode != EC_SOE_OPCODE_WRITE_RESPONSE) {
 EC_ERR("Received no write response (opcode %x).\n", opcode);
 ec_print_data(data, rec_size);
 fsm->state = ec_fsm_soe_error;
 return;
 }
-	idn = EC_READ_U16(data + 2);
+idn = EC_READ_U16(data + 2);
-	if (idn != req->idn) {
+if (idn != req->idn) {
-		EC_ERR("Received response for wrong IDN 0x%04x.\n", idn);
+EC_ERR("Received response for wrong IDN 0x%04x.\n", idn);
 ec_print_data(data, rec_size);
 fsm->state = ec_fsm_soe_error;
-		return;
+return;
-	}
+}
-	error_flag = (EC_READ_U8(data) >> 4) & 1;
+error_flag = (EC_READ_U8(data) >> 4) & 1;
-	if (error_flag) {
+if (error_flag) {
-		if (rec_size < EC_SOE_WRITE_RESPONSE_SIZE + 2) {
+if (rec_size < EC_SOE_WRITE_RESPONSE_SIZE + 2) {
-			EC_ERR("Received corrupted error response - error flag set,"
+EC_ERR("Received corrupted error response - error flag set,"
-					" but received size is %zu.\n", rec_size);
+" but received size is %zu.\n", rec_size);
-		} else {
+} else {
-			req->error_code = EC_READ_U16(data + EC_SOE_WRITE_RESPONSE_SIZE);
+req->error_code = EC_READ_U16(data + EC_SOE_WRITE_RESPONSE_SIZE);
-			EC_ERR("Received error response: 0x%04x.\n",
+EC_ERR("Received error response: 0x%04x.\n",
-					req->error_code);
+req->error_code);
-		}
+}
-		ec_print_data(data, rec_size);
+ec_print_data(data, rec_size);
-		fsm->state = ec_fsm_soe_error;
+fsm->state = ec_fsm_soe_error;
 return;
-	} else {
+} else {
-		req->error_code = 0x0000;
+req->error_code = 0x0000;
-	}
+}
 fsm->state = ec_fsm_soe_end; // success
 }
 /*****************************************************************************/

changeset 1873	219be3742274
parent 1866	02323e72efc9
child 1877	7b77000f9764