Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
提交 880d29f1 编写于 作者: J Jiri Slaby 提交者： Jiri Kosina
浏览文件
操作

HID: indent switches/cases 

Bring switch and cases into coding style and save thus some
indentation to make the code tighter.
Signed-off-by: NJiri Slaby <jirislaby@gmail.com>
Signed-off-by: NJiri Kosina <jkosina@suse.cz>
上级 02ae9a1a
展开全部 隐藏空白更改
内联 并排
Showing with 508 addition and 522 deletion
drivers/hid/hid-core.c
浏览文件 @ 880d29f1
...@@ -270,9 +270,9 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign ...@@ -270,9 +270,9 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign
static u32 item_udata(struct hid_item *item) static u32 item_udata(struct hid_item *item)
{ {
switch (item->size) { switch (item->size) {
case 1: return item->data.u8; case 1: return item->data.u8;
case 2: return item->data.u16; case 2: return item->data.u16;
case 4: return item->data.u32; case 4: return item->data.u32;
} }
return 0; return 0;
} }
...@@ -280,9 +280,9 @@ static u32 item_udata(struct hid_item *item) ...@@ -280,9 +280,9 @@ static u32 item_udata(struct hid_item *item)
static s32 item_sdata(struct hid_item *item) static s32 item_sdata(struct hid_item *item)
{ {
switch (item->size) { switch (item->size) {
case 1: return item->data.s8; case 1: return item->data.s8;
case 2: return item->data.s16; case 2: return item->data.s16;
case 4: return item->data.s32; case 4: return item->data.s32;
} }
return 0; return 0;
} }
...@@ -294,87 +294,91 @@ static s32 item_sdata(struct hid_item *item) ...@@ -294,87 +294,91 @@ static s32 item_sdata(struct hid_item *item)
static int hid_parser_global(struct hid_parser *parser, struct hid_item *item) static int hid_parser_global(struct hid_parser *parser, struct hid_item *item)
{ {
switch (item->tag) { switch (item->tag) {
case HID_GLOBAL_ITEM_TAG_PUSH:
case HID_GLOBAL_ITEM_TAG_PUSH: if (parser->global_stack_ptr == HID_GLOBAL_STACK_SIZE) {
dbg_hid("global enviroment stack overflow\n");
if (parser->global_stack_ptr == HID_GLOBAL_STACK_SIZE) { return -1;
dbg_hid("global enviroment stack overflow\n"); }
return -1;
}
memcpy(parser->global_stack + parser->global_stack_ptr++,
&parser->global, sizeof(struct hid_global));
return 0;
case HID_GLOBAL_ITEM_TAG_POP: memcpy(parser->global_stack + parser->global_stack_ptr++,
&parser->global, sizeof(struct hid_global));
return 0;
if (!parser->global_stack_ptr) { case HID_GLOBAL_ITEM_TAG_POP:
dbg_hid("global enviroment stack underflow\n");
return -1;
}
memcpy(&parser->global, parser->global_stack + --parser->global_stack_ptr, if (!parser->global_stack_ptr) {
sizeof(struct hid_global)); dbg_hid("global enviroment stack underflow\n");
return 0; return -1;
}
case HID_GLOBAL_ITEM_TAG_USAGE_PAGE: memcpy(&parser->global, parser->global_stack +
parser->global.usage_page = item_udata(item); --parser->global_stack_ptr, sizeof(struct hid_global));
return 0; return 0;
case HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM: case HID_GLOBAL_ITEM_TAG_USAGE_PAGE:
parser->global.logical_minimum = item_sdata(item); parser->global.usage_page = item_udata(item);
return 0; return 0;
case HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM: case HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM:
if (parser->global.logical_minimum < 0) parser->global.logical_minimum = item_sdata(item);
parser->global.logical_maximum = item_sdata(item); return 0;
else
parser->global.logical_maximum = item_udata(item);
return 0;
case HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM: case HID_GLOBAL_ITEM_TAG_LOGICAL_MAXIMUM:
parser->global.physical_minimum = item_sdata(item); if (parser->global.logical_minimum < 0)
return 0; parser->global.logical_maximum = item_sdata(item);
else
parser->global.logical_maximum = item_udata(item);
return 0;
case HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM: case HID_GLOBAL_ITEM_TAG_PHYSICAL_MINIMUM:
if (parser->global.physical_minimum < 0) parser->global.physical_minimum = item_sdata(item);
parser->global.physical_maximum = item_sdata(item); return 0;
else
parser->global.physical_maximum = item_udata(item);
return 0;
case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT: case HID_GLOBAL_ITEM_TAG_PHYSICAL_MAXIMUM:
parser->global.unit_exponent = item_sdata(item); if (parser->global.physical_minimum < 0)
return 0; parser->global.physical_maximum = item_sdata(item);
else
parser->global.physical_maximum = item_udata(item);
return 0;
case HID_GLOBAL_ITEM_TAG_UNIT: case HID_GLOBAL_ITEM_TAG_UNIT_EXPONENT:
parser->global.unit = item_udata(item); parser->global.unit_exponent = item_sdata(item);
return 0; return 0;
case HID_GLOBAL_ITEM_TAG_REPORT_SIZE: case HID_GLOBAL_ITEM_TAG_UNIT:
if ((parser->global.report_size = item_udata(item)) > 32) { parser->global.unit = item_udata(item);
dbg_hid("invalid report_size %d\n", parser->global.report_size); return 0;
return -1;
}
return 0;
case HID_GLOBAL_ITEM_TAG_REPORT_COUNT: case HID_GLOBAL_ITEM_TAG_REPORT_SIZE:
if ((parser->global.report_count = item_udata(item)) > HID_MAX_USAGES) { parser->global.report_size = item_udata(item);
dbg_hid("invalid report_count %d\n", parser->global.report_count); if (parser->global.report_size > 32) {
return -1; dbg_hid("invalid report_size %d\n",
} parser->global.report_size);
return 0; return -1;
}
return 0;
case HID_GLOBAL_ITEM_TAG_REPORT_ID: case HID_GLOBAL_ITEM_TAG_REPORT_COUNT:
if ((parser->global.report_id = item_udata(item)) == 0) { parser->global.report_count = item_udata(item);
dbg_hid("report_id 0 is invalid\n"); if (parser->global.report_count > HID_MAX_USAGES) {
return -1; dbg_hid("invalid report_count %d\n",
} parser->global.report_count);
return 0; return -1;
}
return 0;
default: case HID_GLOBAL_ITEM_TAG_REPORT_ID:
dbg_hid("unknown global tag 0x%x\n", item->tag); parser->global.report_id = item_udata(item);
if (parser->global.report_id == 0) {
dbg_hid("report_id 0 is invalid\n");
return -1; return -1;
}
return 0;
default:
dbg_hid("unknown global tag 0x%x\n", item->tag);
return -1;
} }
} }
...@@ -395,77 +399,76 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item) ...@@ -395,77 +399,76 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
data = item_udata(item); data = item_udata(item);
switch (item->tag) { switch (item->tag) {
case HID_LOCAL_ITEM_TAG_DELIMITER:
case HID_LOCAL_ITEM_TAG_DELIMITER:
if (data) {
if (data) { /*
/* * We treat items before the first delimiter
* We treat items before the first delimiter * as global to all usage sets (branch 0).
* as global to all usage sets (branch 0). * In the moment we process only these global
* In the moment we process only these global * items and the first delimiter set.
* items and the first delimiter set. */
*/ if (parser->local.delimiter_depth != 0) {
if (parser->local.delimiter_depth != 0) { dbg_hid("nested delimiters\n");
dbg_hid("nested delimiters\n"); return -1;
return -1;
}
parser->local.delimiter_depth++;
parser->local.delimiter_branch++;
} else {
if (parser->local.delimiter_depth < 1) {
dbg_hid("bogus close delimiter\n");
return -1;
}
parser->local.delimiter_depth--;
} }
return 1; parser->local.delimiter_depth++;
parser->local.delimiter_branch++;
case HID_LOCAL_ITEM_TAG_USAGE: } else {
if (parser->local.delimiter_depth < 1) {
if (parser->local.delimiter_branch > 1) { dbg_hid("bogus close delimiter\n");
dbg_hid("alternative usage ignored\n"); return -1;
return 0;
} }
parser->local.delimiter_depth--;
}
return 1;
if (item->size <= 2) case HID_LOCAL_ITEM_TAG_USAGE:
data = (parser->global.usage_page << 16) + data;
return hid_add_usage(parser, data); if (parser->local.delimiter_branch > 1) {
dbg_hid("alternative usage ignored\n");
return 0;
}
case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM: if (item->size <= 2)
data = (parser->global.usage_page << 16) + data;
if (parser->local.delimiter_branch > 1) { return hid_add_usage(parser, data);
dbg_hid("alternative usage ignored\n");
return 0;
}
if (item->size <= 2) case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM:
data = (parser->global.usage_page << 16) + data;
parser->local.usage_minimum = data; if (parser->local.delimiter_branch > 1) {
dbg_hid("alternative usage ignored\n");
return 0; return 0;
}
case HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM: if (item->size <= 2)
data = (parser->global.usage_page << 16) + data;
if (parser->local.delimiter_branch > 1) { parser->local.usage_minimum = data;
dbg_hid("alternative usage ignored\n"); return 0;
return 0;
}
if (item->size <= 2) case HID_LOCAL_ITEM_TAG_USAGE_MAXIMUM:
data = (parser->global.usage_page << 16) + data;
for (n = parser->local.usage_minimum; n <= data; n++) if (parser->local.delimiter_branch > 1) {
if (hid_add_usage(parser, n)) { dbg_hid("alternative usage ignored\n");
dbg_hid("hid_add_usage failed\n");
return -1;
}
return 0; return 0;
}
default: if (item->size <= 2)
data = (parser->global.usage_page << 16) + data;
dbg_hid("unknown local item tag 0x%x\n", item->tag); for (n = parser->local.usage_minimum; n <= data; n++)
return 0; if (hid_add_usage(parser, n)) {
dbg_hid("hid_add_usage failed\n");
return -1;
}
return 0;
default:
dbg_hid("unknown local item tag 0x%x\n", item->tag);
return 0;
} }
return 0; return 0;
} }
...@@ -482,24 +485,24 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item) ...@@ -482,24 +485,24 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)
data = item_udata(item); data = item_udata(item);
switch (item->tag) { switch (item->tag) {
case HID_MAIN_ITEM_TAG_BEGIN_COLLECTION: case HID_MAIN_ITEM_TAG_BEGIN_COLLECTION:
ret = open_collection(parser, data & 0xff); ret = open_collection(parser, data & 0xff);
break; break;
case HID_MAIN_ITEM_TAG_END_COLLECTION: case HID_MAIN_ITEM_TAG_END_COLLECTION:
ret = close_collection(parser); ret = close_collection(parser);
break; break;
case HID_MAIN_ITEM_TAG_INPUT: case HID_MAIN_ITEM_TAG_INPUT:
ret = hid_add_field(parser, HID_INPUT_REPORT, data); ret = hid_add_field(parser, HID_INPUT_REPORT, data);
break; break;
case HID_MAIN_ITEM_TAG_OUTPUT: case HID_MAIN_ITEM_TAG_OUTPUT:
ret = hid_add_field(parser, HID_OUTPUT_REPORT, data); ret = hid_add_field(parser, HID_OUTPUT_REPORT, data);
break; break;
case HID_MAIN_ITEM_TAG_FEATURE: case HID_MAIN_ITEM_TAG_FEATURE:
ret = hid_add_field(parser, HID_FEATURE_REPORT, data); ret = hid_add_field(parser, HID_FEATURE_REPORT, data);
break; break;
default: default:
dbg_hid("unknown main item tag 0x%x\n", item->tag); dbg_hid("unknown main item tag 0x%x\n", item->tag);
ret = 0; ret = 0;
} }
memset(&parser->local, 0, sizeof(parser->local)); /* Reset the local parser environment */ memset(&parser->local, 0, sizeof(parser->local)); /* Reset the local parser environment */
...@@ -595,30 +598,29 @@ static u8 *fetch_item(__u8 *start, __u8 *end, struct hid_item *item) ...@@ -595,30 +598,29 @@ static u8 *fetch_item(__u8 *start, __u8 *end, struct hid_item *item)
item->size = b & 3; item->size = b & 3;
switch (item->size) { switch (item->size) {
case 0:
return start;
case 1:
if ((end - start) < 1)
return NULL;
item->data.u8 = *start++;
return start;
case 2:
if ((end - start) < 2)
return NULL;
item->data.u16 = get_unaligned_le16(start);
start = (__u8 *)((__le16 *)start + 1);
return start;
case 0: case 3:
return start; item->size++;
if ((end - start) < 4)
case 1: return NULL;
if ((end - start) < 1) item->data.u32 = get_unaligned_le32(start);
return NULL; start = (__u8 *)((__le32 *)start + 1);
item->data.u8 = *start++; return start;
return start;
case 2:
if ((end - start) < 2)
return NULL;
item->data.u16 = get_unaligned_le16(start);
start = (__u8 *)((__le16 *)start + 1);
return start;
case 3:
item->size++;
if ((end - start) < 4)
return NULL;
item->data.u32 = get_unaligned_le32(start);
start = (__u8 *)((__le32 *)start + 1);
return start;
} }
return NULL; return NULL;
...@@ -713,9 +715,9 @@ EXPORT_SYMBOL_GPL(hid_parse_report); ...@@ -713,9 +715,9 @@ EXPORT_SYMBOL_GPL(hid_parse_report);
static s32 snto32(__u32 value, unsigned n) static s32 snto32(__u32 value, unsigned n)
{ {
switch (n) { switch (n) {
case 8: return ((__s8)value); case 8: return ((__s8)value);
case 16: return ((__s16)value); case 16: return ((__s16)value);
case 32: return ((__s32)value); case 32: return ((__s32)value);
} }
return value & (1 << (n - 1)) ? value | (-1 << n) : value; return value & (1 << (n - 1)) ? value | (-1 << n) : value;
} }
......
drivers/hid/hid-input.c
浏览文件 @ 880d29f1
此差异已折叠。
drivers/hid/usbhid/hid-core.c
浏览文件 @ 880d29f1
...@@ -197,31 +197,31 @@ static void hid_irq_in(struct urb *urb) ...@@ -197,31 +197,31 @@ static void hid_irq_in(struct urb *urb)
int status; int status;
switch (urb->status) { switch (urb->status) {
case 0: /* success */ case 0: /* success */
usbhid->retry_delay = 0; usbhid->retry_delay = 0;
hid_input_report(urb->context, HID_INPUT_REPORT, hid_input_report(urb->context, HID_INPUT_REPORT,
urb->transfer_buffer, urb->transfer_buffer,
urb->actual_length, 1); urb->actual_length, 1);
break; break;
case -EPIPE: /* stall */ case -EPIPE: /* stall */
clear_bit(HID_IN_RUNNING, &usbhid->iofl); clear_bit(HID_IN_RUNNING, &usbhid->iofl);
set_bit(HID_CLEAR_HALT, &usbhid->iofl); set_bit(HID_CLEAR_HALT, &usbhid->iofl);
schedule_work(&usbhid->reset_work); schedule_work(&usbhid->reset_work);
return; return;
case -ECONNRESET: /* unlink */ case -ECONNRESET: /* unlink */
case -ENOENT: case -ENOENT:
case -ESHUTDOWN: /* unplug */ case -ESHUTDOWN: /* unplug */
clear_bit(HID_IN_RUNNING, &usbhid->iofl); clear_bit(HID_IN_RUNNING, &usbhid->iofl);
return; return;
case -EILSEQ: /* protocol error or unplug */ case -EILSEQ: /* protocol error or unplug */
case -EPROTO: /* protocol error or unplug */ case -EPROTO: /* protocol error or unplug */
case -ETIME: /* protocol error or unplug */ case -ETIME: /* protocol error or unplug */
case -ETIMEDOUT: /* Should never happen, but... */ case -ETIMEDOUT: /* Should never happen, but... */
clear_bit(HID_IN_RUNNING, &usbhid->iofl); clear_bit(HID_IN_RUNNING, &usbhid->iofl);
hid_io_error(hid); hid_io_error(hid);
return; return;
default: /* error */ default: /* error */
warn("input irq status %d received", urb->status); warn("input irq status %d received", urb->status);
} }
status = usb_submit_urb(urb, GFP_ATOMIC); status = usb_submit_urb(urb, GFP_ATOMIC);
...@@ -319,17 +319,17 @@ static void hid_irq_out(struct urb *urb) ...@@ -319,17 +319,17 @@ static void hid_irq_out(struct urb *urb)
int unplug = 0; int unplug = 0;
switch (urb->status) { switch (urb->status) {
case 0: /* success */ case 0: /* success */
break; break;
case -ESHUTDOWN: /* unplug */ case -ESHUTDOWN: /* unplug */
unplug = 1; unplug = 1;
case -EILSEQ: /* protocol error or unplug */ case -EILSEQ: /* protocol error or unplug */
case -EPROTO: /* protocol error or unplug */ case -EPROTO: /* protocol error or unplug */
case -ECONNRESET: /* unlink */ case -ECONNRESET: /* unlink */
case -ENOENT: case -ENOENT:
break; break;
default: /* error */ default: /* error */
warn("output irq status %d received", urb->status); warn("output irq status %d received", urb->status);
} }
spin_lock_irqsave(&usbhid->outlock, flags); spin_lock_irqsave(&usbhid->outlock, flags);
...@@ -367,21 +367,22 @@ static void hid_ctrl(struct urb *urb) ...@@ -367,21 +367,22 @@ static void hid_ctrl(struct urb *urb)
spin_lock_irqsave(&usbhid->ctrllock, flags); spin_lock_irqsave(&usbhid->ctrllock, flags);
switch (urb->status) { switch (urb->status) {
case 0: /* success */ case 0: /* success */
if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_IN) if (usbhid->ctrl[usbhid->ctrltail].dir == USB_DIR_IN)
hid_input_report(urb->context, usbhid->ctrl[usbhid->ctrltail].report->type, hid_input_report(urb->context,
urb->transfer_buffer, urb->actual_length, 0); usbhid->ctrl[usbhid->ctrltail].report->type,
break; urb->transfer_buffer, urb->actual_length, 0);
case -ESHUTDOWN: /* unplug */ break;
unplug = 1; case -ESHUTDOWN: /* unplug */
case -EILSEQ: /* protocol error or unplug */ unplug = 1;
case -EPROTO: /* protocol error or unplug */ case -EILSEQ: /* protocol error or unplug */
case -ECONNRESET: /* unlink */ case -EPROTO: /* protocol error or unplug */
case -ENOENT: case -ECONNRESET: /* unlink */
case -EPIPE: /* report not available */ case -ENOENT:
break; case -EPIPE: /* report not available */
default: /* error */ break;
warn("ctrl urb status %d received", urb->status); default: /* error */
warn("ctrl urb status %d received", urb->status);
} }
if (unplug) if (unplug)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或