Skip to content

L
linux
Commit 92c16f7e authored by Stefan Richter's avatar Stefan Richter
Browse files
Options

tools/firewire: nosy-dump: change to kernel coding style 

This changes only
  - whitespace
  - C99 initializers
  - comment style
  - order of #includes
  - if { } else { } bracing
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent a8461c0f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 999 additions and 1052 deletions
tools/firewire/decode-fcp.c
View file @ 92c16f7e
...@@ -6,58 +6,34 @@ ...@@ -6,58 +6,34 @@
#define CSR_FCP_COMMAND 0xfffff0000b00ull #define CSR_FCP_COMMAND 0xfffff0000b00ull
#define CSR_FCP_RESPONSE 0xfffff0000d00ull #define CSR_FCP_RESPONSE 0xfffff0000d00ull
static const char * const ctype_names[16] = { static const char * const ctype_names[] = {
"control", [0x0] = "control", [0x8] = "not implemented",
"status", [0x1] = "status", [0x9] = "accepted",
"specific inquiry", [0x2] = "specific inquiry", [0xa] = "rejected",
"notify", [0x3] = "notify", [0xb] = "in transition",
"general inquiry", [0x4] = "general inquiry", [0xc] = "stable",
"(reserved 0x05)", [0x5] = "(reserved 0x05)", [0xd] = "changed",
"(reserved 0x06)", [0x6] = "(reserved 0x06)", [0xe] = "(reserved 0x0e)",
"(reserved 0x07)", [0x7] = "(reserved 0x07)", [0xf] = "interim",
"not implemented",
"accepted",
"rejected",
"in transition",
"stable",
"changed",
"(reserved 0x0e)",
"interim"
}; };
static const char * const subunit_type_names[32] = { static const char * const subunit_type_names[] = {
"monitor", [0x00] = "monitor", [0x10] = "(reserved 0x10)",
"audio", [0x01] = "audio", [0x11] = "(reserved 0x11)",
"printer", [0x02] = "printer", [0x12] = "(reserved 0x12)",
"disc", [0x03] = "disc", [0x13] = "(reserved 0x13)",
"tape recorder/player", [0x04] = "tape recorder/player",[0x14] = "(reserved 0x14)",
"tuner", [0x05] = "tuner", [0x15] = "(reserved 0x15)",
"ca", [0x06] = "ca", [0x16] = "(reserved 0x16)",
"camera", [0x07] = "camera", [0x17] = "(reserved 0x17)",
"(reserved 0x08)", [0x08] = "(reserved 0x08)", [0x18] = "(reserved 0x18)",
"panel", [0x09] = "panel", [0x19] = "(reserved 0x19)",
"bulletin board", [0x0a] = "bulletin board", [0x1a] = "(reserved 0x1a)",
"camera storage", [0x0b] = "camera storage", [0x1b] = "(reserved 0x1b)",
"(reserved 0x0c)", [0x0c] = "(reserved 0x0c)", [0x1c] = "vendor unique",
"(reserved 0x0d)", [0x0d] = "(reserved 0x0d)", [0x1d] = "all subunit types",
"(reserved 0x0e)", [0x0e] = "(reserved 0x0e)", [0x1e] = "subunit_type extended to next byte",
"(reserved 0x0f)", [0x0f] = "(reserved 0x0f)", [0x1f] = "unit",
"(reserved 0x10)",
"(reserved 0x11)",
"(reserved 0x12)",
"(reserved 0x13)",
"(reserved 0x14)",
"(reserved 0x15)",
"(reserved 0x16)",
"(reserved 0x17)",
"(reserved 0x18)",
"(reserved 0x19)",
"(reserved 0x1a)",
"(reserved 0x1b)",
"vendor unique",
"all subunit types",
"subunit_type extended to next byte",
"unit"
}; };
struct avc_enum { struct avc_enum {
...@@ -67,8 +43,8 @@ struct avc_enum { ...@@ -67,8 +43,8 @@ struct avc_enum {
struct avc_field { struct avc_field {
const char *name; /* Short name for field. */ const char *name; /* Short name for field. */
int offset; /* Location of field, specified in bits. int offset; /* Location of field, specified in bits; */
* Negative means from end of packet */ /* negative means from end of packet. */
int width; /* Width of field, 0 means use data_length. */ int width; /* Width of field, 0 means use data_length. */
struct avc_enum *names; struct avc_enum *names;
}; };
...@@ -86,16 +62,13 @@ struct avc_enum power_field_names[] = { ...@@ -86,16 +62,13 @@ struct avc_enum power_field_names[] = {
static const struct avc_opcode_info opcode_info[256] = { static const struct avc_opcode_info opcode_info[256] = {
/* TA Document 1999026 /* TA Document 1999026 */
* AV/C Digital Interface Command Set General Specification /* AV/C Digital Interface Command Set General Specification 4.0 */
* Version 4.0 */ [0xb2] = { "power", {
[0xb2] =
{ "power", {
{ "state", 0, 8, power_field_names } { "state", 0, 8, power_field_names }
} }
}, },
[0x30] = [0x30] = { "unit info", {
{ "unit info", {
{ "foo", 0, 8 }, { "foo", 0, 8 },
{ "unit_type", 8, 5 }, { "unit_type", 8, 5 },
{ "unit", 13, 3 }, { "unit", 13, 3 },
...@@ -106,7 +79,6 @@ static const struct avc_opcode_info opcode_info[256] = { ...@@ -106,7 +79,6 @@ static const struct avc_opcode_info opcode_info[256] = {
[0x01] = { "reserve" }, [0x01] = { "reserve" },
[0xb0] = { "version" }, [0xb0] = { "version" },
[0x00] = { "vendor dependent" }, [0x00] = { "vendor dependent" },
[0x02] = { "plug info" }, [0x02] = { "plug info" },
[0x12] = { "channel usage" }, [0x12] = { "channel usage" },
[0x24] = { "connect" }, [0x24] = { "connect" },
...@@ -120,8 +92,8 @@ static const struct avc_opcode_info opcode_info[256] = { ...@@ -120,8 +92,8 @@ static const struct avc_opcode_info opcode_info[256] = {
[0x18] = { "output plug signal format" }, [0x18] = { "output plug signal format" },
[0x1f] = { "general bus setup" }, [0x1f] = { "general bus setup" },
/* TA Document 1999025 /* TA Document 1999025 */
* AV/C Descriptor Mechanism Specification Version 1.0 */ /* AV/C Descriptor Mechanism Specification Version 1.0 */
[0x0c] = { "create descriptor" }, [0x0c] = { "create descriptor" },
[0x08] = { "open descriptor" }, [0x08] = { "open descriptor" },
[0x09] = { "read descriptor" }, [0x09] = { "read descriptor" },
...@@ -132,8 +104,8 @@ static const struct avc_opcode_info opcode_info[256] = { ...@@ -132,8 +104,8 @@ static const struct avc_opcode_info opcode_info[256] = {
[0x0b] = { "search descriptor" }, [0x0b] = { "search descriptor" },
[0x0d] = { "object number select" }, [0x0d] = { "object number select" },
/* TA Document 1999015 /* TA Document 1999015 */
* AV/C Command Set for Rate Control of Isochronous Data Flow 1.0 */ /* AV/C Command Set for Rate Control of Isochronous Data Flow 1.0 */
[0xb3] = { "rate", { [0xb3] = { "rate", {
{ "subfunction", 0, 8 }, { "subfunction", 0, 8 },
{ "result", 8, 8 }, { "result", 8, 8 },
...@@ -142,12 +114,12 @@ static const struct avc_opcode_info opcode_info[256] = { ...@@ -142,12 +114,12 @@ static const struct avc_opcode_info opcode_info[256] = {
} }
}, },
/* TA Document 1999008 /* TA Document 1999008 */
* AV/C Audio Subunit Specification 1.0 */ /* AV/C Audio Subunit Specification 1.0 */
[0xb8] = { "function block" }, [0xb8] = { "function block" },
/* TA Document 2001001 /* TA Document 2001001 */
* AV/C Panel Subunit Specification 1.1 */ /* AV/C Panel Subunit Specification 1.1 */
[0x7d] = { "gui update" }, [0x7d] = { "gui update" },
[0x7e] = { "push gui data" }, [0x7e] = { "push gui data" },
[0x7f] = { "user action" }, [0x7f] = { "user action" },
...@@ -169,7 +141,8 @@ struct avc_frame { ...@@ -169,7 +141,8 @@ struct avc_frame {
static void static void
decode_avc(struct link_transaction *t) decode_avc(struct link_transaction *t)
{ {
struct avc_frame *frame = (struct avc_frame *) t->request->packet.write_block.data; struct avc_frame *frame =
(struct avc_frame *) t->request->packet.write_block.data;
const struct avc_opcode_info *info; const struct avc_opcode_info *info;
const char *name; const char *name;
char buffer[32]; char buffer[32];
...@@ -177,7 +150,8 @@ decode_avc(struct link_transaction *t) ...@@ -177,7 +150,8 @@ decode_avc(struct link_transaction *t)
info = &opcode_info[frame->opcode]; info = &opcode_info[frame->opcode];
if (info->name == NULL) { if (info->name == NULL) {
snprintf(buffer, sizeof buffer, "(unknown opcode 0x%02x)", frame->opcode); snprintf(buffer, sizeof(buffer),
"(unknown opcode 0x%02x)", frame->opcode);
name = buffer; name = buffer;
} else { } else {
name = info->name; name = info->name;
...@@ -187,21 +161,19 @@ decode_avc(struct link_transaction *t) ...@@ -187,21 +161,19 @@ decode_avc(struct link_transaction *t)
ctype_names[frame->ctype], subunit_type_names[frame->subunit_type], ctype_names[frame->ctype], subunit_type_names[frame->subunit_type],
frame->subunit_id, name); frame->subunit_id, name);
for (i = 0; info->fields[i].name != NULL; i++) { for (i = 0; info->fields[i].name != NULL; i++)
printf(", %s", info->fields[i].name); printf(", %s", info->fields[i].name);
}
printf("\n"); printf("\n");
} }
int int
decode_fcp(struct link_transaction *t) decode_fcp(struct link_transaction *t)
{ {
struct avc_frame *frame = (struct avc_frame *) t->request->packet.write_block.data; struct avc_frame *frame =
unsigned long long offset; (struct avc_frame *) t->request->packet.write_block.data;
unsigned long long offset =
offset = ((unsigned long long) t->request->packet.common.offset_high << 32) | ((unsigned long long) t->request->packet.common.offset_high << 32) |
t->request->packet.common.offset_low; t->request->packet.common.offset_low;
if (t->request->packet.common.tcode != TCODE_WRITE_BLOCK) if (t->request->packet.common.tcode != TCODE_WRITE_BLOCK)
......
tools/firewire/nosy-dump.c
View file @ 92c16f7e
This diff is collapsed.
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