Skip to content

L
linux
Commit 269fe102 authored by Stefan Richter's avatar Stefan Richter
Browse files
Options

tools/firewire: nosy-dump: break up a deeply nested function 

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 468066f7
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 113 deletions
tools/firewire/nosy-dump.c
View file @ 269fe102
...@@ -487,138 +487,157 @@ static const struct packet_info packet_info[] = { ...@@ -487,138 +487,157 @@ static const struct packet_info packet_info[] = {
}; };
static int static int
handle_packet(uint32_t *data, size_t length) handle_request_packet(uint32_t *data, size_t length)
{ {
if (length == 0) { struct link_packet *p = (struct link_packet *) data;
printf("bus reset\r\n"); struct subaction *sa, *prev;
clear_pending_transaction_list(); struct link_transaction *t;
} else if (length > sizeof(struct phy_packet)) {
struct link_packet *p = (struct link_packet *) data;
struct subaction *sa, *prev;
struct link_transaction *t;
switch (packet_info[p->common.tcode].type) { t = link_transaction_lookup(p->common.source, p->common.destination,
case PACKET_REQUEST: p->common.tlabel);
t = link_transaction_lookup(p->common.source, p->common.destination, sa = subaction_create(data, length);
p->common.tlabel); t->request = sa;
sa = subaction_create(data, length);
t->request = sa; if (!list_empty(&t->request_list)) {
prev = list_tail(&t->request_list,
if (!list_empty(&t->request_list)) { struct subaction, link);
prev = list_tail(&t->request_list,
struct subaction, link); if (!ACK_BUSY(prev->ack)) {
/*
if (!ACK_BUSY(prev->ack)) { * error, we should only see ack_busy_* before the
/* * ack_pending/ack_complete -- this is an ack_pending
* error, we should only see ack_busy_* before the * instead (ack_complete would have finished the
* ack_pending/ack_complete -- this is an ack_pending * transaction).
* instead (ack_complete would have finished the */
* transaction). }
*/
}
if (prev->packet.common.tcode != sa->packet.common.tcode || if (prev->packet.common.tcode != sa->packet.common.tcode ||
prev->packet.common.tlabel != sa->packet.common.tlabel) { prev->packet.common.tlabel != sa->packet.common.tlabel) {
/* memcmp() ? */ /* memcmp() ? */
/* error, these should match for retries. */ /* error, these should match for retries. */
} }
} }
list_append(&t->request_list, &sa->link); list_append(&t->request_list, &sa->link);
switch (sa->ack) { switch (sa->ack) {
case ACK_COMPLETE: case ACK_COMPLETE:
if (p->common.tcode != TCODE_WRITE_QUADLET && if (p->common.tcode != TCODE_WRITE_QUADLET &&
p->common.tcode != TCODE_WRITE_BLOCK) p->common.tcode != TCODE_WRITE_BLOCK)
/* error, unified transactions only allowed for write */; /* error, unified transactions only allowed for write */;
list_remove(&t->link); list_remove(&t->link);
handle_transaction(t); handle_transaction(t);
break; break;
case ACK_NO_ACK: case ACK_NO_ACK:
case ACK_DATA_ERROR: case ACK_DATA_ERROR:
case ACK_TYPE_ERROR: case ACK_TYPE_ERROR:
list_remove(&t->link); list_remove(&t->link);
handle_transaction(t); handle_transaction(t);
break; break;
case ACK_PENDING:
/* request subaction phase over, wait for response. */
break;
case ACK_BUSY_X:
case ACK_BUSY_A:
case ACK_BUSY_B:
/* ok, wait for retry. */
/* check that retry protocol is respected. */
break;
}
case ACK_PENDING: return 1;
/* request subaction phase over, wait for response. */ }
break;
case ACK_BUSY_X: static int
case ACK_BUSY_A: handle_response_packet(uint32_t *data, size_t length)
case ACK_BUSY_B: {
/* ok, wait for retry. */ struct link_packet *p = (struct link_packet *) data;
/* check that retry protocol is respected. */ struct subaction *sa, *prev;
break; struct link_transaction *t;
}
break;
case PACKET_RESPONSE: t = link_transaction_lookup(p->common.destination, p->common.source,
t = link_transaction_lookup(p->common.destination, p->common.source, p->common.tlabel);
p->common.tlabel); if (list_empty(&t->request_list)) {
if (list_empty(&t->request_list)) { /* unsolicited response */
/* unsolicited response */ }
}
sa = subaction_create(data, length); sa = subaction_create(data, length);
t->response = sa; t->response = sa;
if (!list_empty(&t->response_list)) { if (!list_empty(&t->response_list)) {
prev = list_tail(&t->response_list, struct subaction, link); prev = list_tail(&t->response_list, struct subaction, link);
if (!ACK_BUSY(prev->ack)) { if (!ACK_BUSY(prev->ack)) {
/* /*
* error, we should only see ack_busy_* before the * error, we should only see ack_busy_* before the
* ack_pending/ack_complete * ack_pending/ack_complete
*/ */
} }
if (prev->packet.common.tcode != sa->packet.common.tcode || if (prev->packet.common.tcode != sa->packet.common.tcode ||
prev->packet.common.tlabel != sa->packet.common.tlabel) { prev->packet.common.tlabel != sa->packet.common.tlabel) {
/* use memcmp() instead? */ /* use memcmp() instead? */
/* error, these should match for retries. */ /* error, these should match for retries. */
} }
} else { } else {
prev = list_tail(&t->request_list, struct subaction, link); prev = list_tail(&t->request_list, struct subaction, link);
if (prev->ack != ACK_PENDING) { if (prev->ack != ACK_PENDING) {
/* /*
* error, should not get response unless last request got * error, should not get response unless last request got
* ack_pending. * ack_pending.
*/ */
} }
if (packet_info[prev->packet.common.tcode].response_tcode != if (packet_info[prev->packet.common.tcode].response_tcode !=
sa->packet.common.tcode) { sa->packet.common.tcode) {
/* error, tcode mismatch */ /* error, tcode mismatch */
} }
} }
list_append(&t->response_list, &sa->link); list_append(&t->response_list, &sa->link);
switch (sa->ack) { switch (sa->ack) {
case ACK_COMPLETE: case ACK_COMPLETE:
case ACK_NO_ACK: case ACK_NO_ACK:
case ACK_DATA_ERROR: case ACK_DATA_ERROR:
case ACK_TYPE_ERROR: case ACK_TYPE_ERROR:
list_remove(&t->link); list_remove(&t->link);
handle_transaction(t); handle_transaction(t);
/* transaction complete, remove t from pending list. */ /* transaction complete, remove t from pending list. */
break; break;
case ACK_PENDING:
/* error for responses. */
break;
case ACK_BUSY_X:
case ACK_BUSY_A:
case ACK_BUSY_B:
/* no problem, wait for next retry */
break;
}
case ACK_PENDING: return 1;
/* error for responses. */ }
break;
case ACK_BUSY_X: static int
case ACK_BUSY_A: handle_packet(uint32_t *data, size_t length)
case ACK_BUSY_B: {
/* no problem, wait for next retry */ if (length == 0) {
break; printf("bus reset\r\n");
} clear_pending_transaction_list();
} else if (length > sizeof(struct phy_packet)) {
struct link_packet *p = (struct link_packet *) data;
break; switch (packet_info[p->common.tcode].type) {
case PACKET_REQUEST:
return handle_request_packet(data, length);
case PACKET_RESPONSE:
return handle_response_packet(data, length);
case PACKET_OTHER: case PACKET_OTHER:
case PACKET_RESERVED: case PACKET_RESERVED:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7