Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests/lib/libusbhid Move libusbhid tests' Report Descriptors...
details: https://anonhg.NetBSD.org/src/rev/cf97a005900d
branches: trunk
changeset: 342674:cf97a005900d
user: jakllsch <jakllsch%NetBSD.org@localhost>
date: Mon Jan 04 22:07:16 2016 +0000
description:
Move libusbhid tests' Report Descriptors and Report Data to seperate file,
so future tests of the kernel HID functions can use them too.
diffstat:
tests/lib/libusbhid/hid_test_data.c | 134 ++++++++++++++++++++++++++++++++++++
tests/lib/libusbhid/t_usbhid.c | 110 +----------------------------
2 files changed, 137 insertions(+), 107 deletions(-)
diffs (269 lines):
diff -r 9b40ed9a3ed3 -r cf97a005900d tests/lib/libusbhid/hid_test_data.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/lib/libusbhid/hid_test_data.c Mon Jan 04 22:07:16 2016 +0000
@@ -0,0 +1,134 @@
+/* $NetBSD: hid_test_data.c,v 1.1 2016/01/04 22:07:16 jakllsch Exp $ */
+
+/*
+ * Copyright (c) 2016 Jonathan A. Kollasch
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+static const uint8_t range_test_report_descriptor[] = {
+ 0x0b, 0x03, 0x00, 0x00, 0xff, // Usage
+ 0x75, 0x20, // Report Size
+ 0x95, 0x01, // Report Count
+ 0x17, 0x00, 0x00, 0x00, 0x80, // Logical Minimum
+ 0x27, 0xff, 0xff, 0xff, 0x7f, // Logical Maximum
+ 0x37, 0x00, 0x00, 0x00, 0x80, // Physical Minimum
+ 0x47, 0xff, 0xff, 0xff, 0x7f, // Physical Maximum
+ 0x81, 0x00, // Input
+
+ 0x0b, 0x02, 0x00, 0x00, 0xff, // Usage
+ 0x75, 0x10, // Report Size
+ 0x95, 0x01, // Report Count
+ 0x16, 0x00, 0x80, // Logical Minimum
+ 0x26, 0xff, 0x7f, // Logical Maximum
+ 0x36, 0x00, 0x80, // Physical Minimum
+ 0x46, 0xff, 0x7f, // Physical Maximum
+ 0x81, 0x00, // Input
+
+ 0x0b, 0x01, 0x00, 0x00, 0xff, // Usage
+ 0x75, 0x08, // Report Size
+ 0x95, 0x01, // Report Count
+ 0x15, 0x80, // Logical Minimum
+ 0x25, 0x7f, // Logical Maximum
+ 0x35, 0x80, // Physical Minimum
+ 0x45, 0x7f, // Physical Maximum
+ 0x81, 0x00, // Input
+};
+
+static const uint8_t range_test_minimum_report[7] = {
+ 0x00, 0x00, 0x00, 0x80,
+ 0x00, 0x80,
+ 0x80,
+};
+
+static const uint8_t range_test_negative_one_report[7] = {
+ 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff,
+ 0xff,
+};
+
+static const uint8_t range_test_positive_one_report[7] = {
+ 0x01, 0x00, 0x00, 0x00,
+ 0x01, 0x00,
+ 0x01,
+};
+
+static const uint8_t range_test_maximum_report[7] = {
+ 0xff, 0xff, 0xff, 0x7f,
+ 0xff, 0x7f,
+ 0x7f,
+};
+
+static const uint8_t unsigned_range_test_report_descriptor[] = {
+ 0x0b, 0x13, 0x00, 0x00, 0xff, // Usage
+ 0x75, 0x20, // Report Size
+ 0x95, 0x01, // Report Count
+ 0x17, 0x00, 0x00, 0x00, 0x00, // Logical Minimum
+ 0x27, 0xff, 0xff, 0xff, 0xff, // Logical Maximum
+ 0x37, 0x00, 0x00, 0x00, 0x00, // Physical Minimum
+ 0x47, 0xff, 0xff, 0xff, 0xff, // Physical Maximum
+ 0x81, 0x00, // Input
+
+ 0x0b, 0x12, 0x00, 0x00, 0xff, // Usage
+ 0x75, 0x10, // Report Size
+ 0x95, 0x01, // Report Count
+ 0x16, 0x00, 0x00, // Logical Minimum
+ 0x26, 0xff, 0xff, // Logical Maximum
+ 0x36, 0x00, 0x00, // Physical Minimum
+ 0x46, 0xff, 0xff, // Physical Maximum
+ 0x81, 0x00, // Input
+
+ 0x0b, 0x11, 0x00, 0x00, 0xff, // Usage
+ 0x75, 0x08, // Report Size
+ 0x95, 0x01, // Report Count
+ 0x15, 0x00, // Logical Minimum
+ 0x25, 0xff, // Logical Maximum
+ 0x35, 0x00, // Physical Minimum
+ 0x45, 0xff, // Physical Maximum
+ 0x81, 0x00, // Input
+};
+
+static const uint8_t unsigned_range_test_minimum_report[7] = {
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00,
+ 0x00,
+};
+
+static const uint8_t unsigned_range_test_positive_one_report[7] = {
+ 0x01, 0x00, 0x00, 0x00,
+ 0x01, 0x00,
+ 0x01,
+};
+
+static const uint8_t unsigned_range_test_negative_one_report[7] = {
+ 0xfe, 0xff, 0xff, 0xff,
+ 0xfe, 0xff,
+ 0xfe,
+};
+
+static const uint8_t unsigned_range_test_maximum_report[7] = {
+ 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff,
+ 0xff,
+};
+
diff -r 9b40ed9a3ed3 -r cf97a005900d tests/lib/libusbhid/t_usbhid.c
--- a/tests/lib/libusbhid/t_usbhid.c Mon Jan 04 19:24:15 2016 +0000
+++ b/tests/lib/libusbhid/t_usbhid.c Mon Jan 04 22:07:16 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_usbhid.c,v 1.8 2016/01/03 15:26:39 jakllsch Exp $ */
+/* $NetBSD: t_usbhid.c,v 1.9 2016/01/04 22:07:16 jakllsch Exp $ */
/*
* Copyright (c) 2016 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_usbhid.c,v 1.8 2016/01/03 15:26:39 jakllsch Exp $");
+__RCSID("$NetBSD: t_usbhid.c,v 1.9 2016/01/04 22:07:16 jakllsch Exp $");
#include <atf-c.h>
@@ -55,111 +55,7 @@
#define MYx_ATF_CHECK_EQ(d, v) \
ATF_CHECK_EQ_MSG(d, v, "== 0x%x", (d))
-static const uint8_t range_test_report_descriptor[] = {
- 0x0b, 0x03, 0x00, 0x00, 0xff, // Usage
- 0x75, 0x20, // Report Size
- 0x95, 0x01, // Report Count
- 0x17, 0x00, 0x00, 0x00, 0x80, // Logical Minimum
- 0x27, 0xff, 0xff, 0xff, 0x7f, // Logical Maximum
- 0x37, 0x00, 0x00, 0x00, 0x80, // Physical Minimum
- 0x47, 0xff, 0xff, 0xff, 0x7f, // Physical Maximum
- 0x81, 0x00, // Input
-
- 0x0b, 0x02, 0x00, 0x00, 0xff, // Usage
- 0x75, 0x10, // Report Size
- 0x95, 0x01, // Report Count
- 0x16, 0x00, 0x80, // Logical Minimum
- 0x26, 0xff, 0x7f, // Logical Maximum
- 0x36, 0x00, 0x80, // Physical Minimum
- 0x46, 0xff, 0x7f, // Physical Maximum
- 0x81, 0x00, // Input
-
- 0x0b, 0x01, 0x00, 0x00, 0xff, // Usage
- 0x75, 0x08, // Report Size
- 0x95, 0x01, // Report Count
- 0x15, 0x80, // Logical Minimum
- 0x25, 0x7f, // Logical Maximum
- 0x35, 0x80, // Physical Minimum
- 0x45, 0x7f, // Physical Maximum
- 0x81, 0x00, // Input
-};
-
-static const uint8_t range_test_minimum_report[7] = {
- 0x00, 0x00, 0x00, 0x80,
- 0x00, 0x80,
- 0x80,
-};
-
-static const uint8_t range_test_negative_one_report[7] = {
- 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff,
- 0xff,
-};
-
-static const uint8_t range_test_positive_one_report[7] = {
- 0x01, 0x00, 0x00, 0x00,
- 0x01, 0x00,
- 0x01,
-};
-
-static const uint8_t range_test_maximum_report[7] = {
- 0xff, 0xff, 0xff, 0x7f,
- 0xff, 0x7f,
- 0x7f,
-};
-
-static const uint8_t unsigned_range_test_report_descriptor[] = {
- 0x0b, 0x13, 0x00, 0x00, 0xff, // Usage
- 0x75, 0x20, // Report Size
- 0x95, 0x01, // Report Count
- 0x17, 0x00, 0x00, 0x00, 0x00, // Logical Minimum
- 0x27, 0xff, 0xff, 0xff, 0xff, // Logical Maximum
- 0x37, 0x00, 0x00, 0x00, 0x00, // Physical Minimum
- 0x47, 0xff, 0xff, 0xff, 0xff, // Physical Maximum
- 0x81, 0x00, // Input
-
- 0x0b, 0x12, 0x00, 0x00, 0xff, // Usage
- 0x75, 0x10, // Report Size
- 0x95, 0x01, // Report Count
- 0x16, 0x00, 0x00, // Logical Minimum
- 0x26, 0xff, 0xff, // Logical Maximum
- 0x36, 0x00, 0x00, // Physical Minimum
- 0x46, 0xff, 0xff, // Physical Maximum
- 0x81, 0x00, // Input
-
- 0x0b, 0x11, 0x00, 0x00, 0xff, // Usage
- 0x75, 0x08, // Report Size
- 0x95, 0x01, // Report Count
- 0x15, 0x00, // Logical Minimum
- 0x25, 0xff, // Logical Maximum
- 0x35, 0x00, // Physical Minimum
- 0x45, 0xff, // Physical Maximum
- 0x81, 0x00, // Input
-};
-
-static const uint8_t unsigned_range_test_minimum_report[7] = {
- 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00,
- 0x00,
-};
-
-static const uint8_t unsigned_range_test_positive_one_report[7] = {
- 0x01, 0x00, 0x00, 0x00,
- 0x01, 0x00,
- 0x01,
-};
-
-static const uint8_t unsigned_range_test_negative_one_report[7] = {
- 0xfe, 0xff, 0xff, 0xff,
- 0xfe, 0xff,
- 0xfe,
-};
-
-static const uint8_t unsigned_range_test_maximum_report[7] = {
- 0xff, 0xff, 0xff, 0xff,
- 0xff, 0xff,
- 0xff,
-};
+#include "hid_test_data.c"
ATF_TC_HEAD(check_hid_usage, tc)
{
Home |
Main Index |
Thread Index |
Old Index