Index: uspace/app/virtusbkbd/Makefile =================================================================== --- uspace/app/virtusbkbd/Makefile (revision e22ce0b9369d60d52bf407df9ee5bd4b391352e2) +++ uspace/app/virtusbkbd/Makefile (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) @@ -36,5 +36,5 @@ SOURCES = \ - report.c \ + kbdconfig.c \ virtusbkbd.c Index: uspace/app/virtusbkbd/descriptor.h =================================================================== --- uspace/app/virtusbkbd/descriptor.h (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) +++ uspace/app/virtusbkbd/descriptor.h (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup usb + * @{ + */ +/** @file + * @brief USB keyboard descriptors. + */ +#ifndef VUK_DESCRIPTOR_H_ +#define VUK_DESCRIPTOR_H_ + +typedef struct { + uint8_t length; + uint8_t type; + uint16_t hid_spec_release; + uint8_t country_code; + uint8_t descriptor_count; + uint8_t descriptor1_type; + uint16_t descriptor1_length; +} __attribute__ ((packed)) hid_descriptor_t; + +#endif +/** + * @} + */ Index: uspace/app/virtusbkbd/items.h =================================================================== --- uspace/app/virtusbkbd/items.h (revision e22ce0b9369d60d52bf407df9ee5bd4b391352e2) +++ uspace/app/virtusbkbd/items.h (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) @@ -38,5 +38,5 @@ #include -typedef uint8_t hid_descriptor_t[]; +typedef uint8_t report_descriptor_data_t[]; /* Item types. */ Index: uspace/app/virtusbkbd/kbdconfig.c =================================================================== --- uspace/app/virtusbkbd/kbdconfig.c (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) +++ uspace/app/virtusbkbd/kbdconfig.c (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup usb + * @{ + */ +/** + * @file + * @brief Keyboard configuration. + */ +#include "kbdconfig.h" +#include +#include + +/** Standard device descriptor. */ +usb_standard_device_descriptor_t std_descriptor = { + .length = sizeof(usb_standard_device_descriptor_t), + .descriptor_type = 1, + .usb_spec_version = 0x110, + .device_class = USB_CLASS_HID, + .device_subclass = 0, + .device_protocol = 0, + .max_packet_size = 64, + .configuration_count = 1 +}; +size_t std_descriptor_size = sizeof(std_descriptor); + +/** USB keyboard report descriptor. + * Copied from USB HID 1.11 (section E.6). + */ +report_descriptor_data_t report_descriptor = { + STD_USAGE_PAGE(USB_HIDUT_PAGE_GENERIC_DESKTOP), + USAGE1(USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD), + START_COLLECTION(COLLECTION_APPLICATION), + STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), + USAGE_MINIMUM1(224), + USAGE_MAXIMUM1(231), + LOGICAL_MINIMUM1(0), + LOGICAL_MAXIMUM1(1), + REPORT_SIZE1(1), + REPORT_COUNT1(8), + /* Modifiers */ + INPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), + REPORT_COUNT1(1), + REPORT_SIZE1(8), + /* Reserved */ + INPUT(IOF_CONSTANT), + REPORT_COUNT1(5), + REPORT_SIZE1(1), + STD_USAGE_PAGE(USB_HIDUT_PAGE_LED), + USAGE_MINIMUM1(1), + USAGE_MAXIMUM1(5), + /* LED states */ + OUTPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), + REPORT_COUNT1(1), + REPORT_SIZE1(3), + /* LED states padding */ + OUTPUT(IOF_CONSTANT), + REPORT_COUNT1(6), + REPORT_SIZE1(8), + LOGICAL_MINIMUM1(0), + LOGICAL_MAXIMUM1(101), + STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), + USAGE_MINIMUM1(0), + USAGE_MAXIMUM1(101), + /* Key array */ + INPUT(IOF_DATA | IOF_ARRAY), + END_COLLECTION() +}; +size_t report_descriptor_size = sizeof(report_descriptor); + +/** HID descriptor. */ +hid_descriptor_t hid_descriptor = { + .length = sizeof(hid_descriptor_t), + .type = 0x21, // HID descriptor + .hid_spec_release = 0x101, + .country_code = 0, + .descriptor_count = 1, + .descriptor1_type = 0x22, // Report descriptor + .descriptor1_length = sizeof(report_descriptor) +}; +size_t hid_descriptor_size = sizeof(hid_descriptor); + + + +/** @} + */ Index: uspace/app/virtusbkbd/kbdconfig.h =================================================================== --- uspace/app/virtusbkbd/kbdconfig.h (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) +++ uspace/app/virtusbkbd/kbdconfig.h (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. + */ + +/** @addtogroup usb + * @{ + */ +/** @file + * @brief USB keyboard configuration. + */ +#ifndef VUK_KBDCONFIG_H_ +#define VUK_KBDCONFIG_H_ + +#include +#include "report.h" +#include "descriptor.h" + +extern usb_standard_device_descriptor_t std_descriptor; +extern size_t std_descriptor_size; +extern hid_descriptor_t hid_descriptor; +extern size_t hid_descriptor_size; +extern report_descriptor_data_t report_descriptor; +extern size_t report_descriptor_size; + + +#endif +/** + * @} + */ Index: pace/app/virtusbkbd/report.c =================================================================== --- uspace/app/virtusbkbd/report.c (revision e22ce0b9369d60d52bf407df9ee5bd4b391352e2) +++ (revision ) @@ -1,86 +1,0 @@ -/* - * Copyright (c) 2010 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/** @addtogroup usb - * @{ - */ -/** - * @file - * @brief HIDE Report Descriptor. - */ -#include "report.h" -#include - -/** USB keyboard report descriptor. - * Copied from USB HID 1.11 (section E.6). - */ -hid_descriptor_t report_descriptor = { - STD_USAGE_PAGE(USB_HIDUT_PAGE_GENERIC_DESKTOP), - USAGE1(USB_HIDUT_USAGE_GENERIC_DESKTOP_KEYBOARD), - START_COLLECTION(COLLECTION_APPLICATION), - STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), - USAGE_MINIMUM1(224), - USAGE_MAXIMUM1(231), - LOGICAL_MINIMUM1(0), - LOGICAL_MAXIMUM1(1), - REPORT_SIZE1(1), - REPORT_COUNT1(8), - /* Modifiers */ - INPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), - REPORT_COUNT1(1), - REPORT_SIZE1(8), - /* Reserved */ - INPUT(IOF_CONSTANT), - REPORT_COUNT1(5), - REPORT_SIZE1(1), - STD_USAGE_PAGE(USB_HIDUT_PAGE_LED), - USAGE_MINIMUM1(1), - USAGE_MAXIMUM1(5), - /* LED states */ - OUTPUT(IOF_DATA | IOF_VARIABLE | IOF_ABSOLUTE), - REPORT_COUNT1(1), - REPORT_SIZE1(3), - /* LED states padding */ - OUTPUT(IOF_CONSTANT), - REPORT_COUNT1(6), - REPORT_SIZE1(8), - LOGICAL_MINIMUM1(0), - LOGICAL_MAXIMUM1(101), - STD_USAGE_PAGE(USB_HIDUT_PAGE_KEYBOARD), - USAGE_MINIMUM1(0), - USAGE_MAXIMUM1(101), - /* Key array */ - INPUT(IOF_DATA | IOF_ARRAY), - END_COLLECTION() -}; - -size_t report_descriptor_size = sizeof(report_descriptor); - - -/** @} - */ Index: uspace/app/virtusbkbd/report.h =================================================================== --- uspace/app/virtusbkbd/report.h (revision e22ce0b9369d60d52bf407df9ee5bd4b391352e2) +++ uspace/app/virtusbkbd/report.h (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) @@ -79,6 +79,4 @@ ITEM_CREATE1(ITEM_MAIN, TAG_OUTPUT, modifiers) -extern hid_descriptor_t report_descriptor; -extern size_t report_descriptor_size; #endif Index: uspace/app/virtusbkbd/virtusbkbd.c =================================================================== --- uspace/app/virtusbkbd/virtusbkbd.c (revision e22ce0b9369d60d52bf407df9ee5bd4b391352e2) +++ uspace/app/virtusbkbd/virtusbkbd.c (revision bbf79e0d190e9a743b0e9c0686b4470b5b551ae4) @@ -52,5 +52,5 @@ #include -#include "report.h" +#include "kbdconfig.h" #define LOOPS 5 @@ -80,15 +80,4 @@ return EOK; } - -static usb_standard_device_descriptor_t std_descriptor = { - .length = sizeof(usb_standard_device_descriptor_t), - .descriptor_type = 1, - .usb_spec_version = 0x110, - .device_class = 0x03, - .device_subclass = 0, - .device_protocol = 0, - .max_packet_size = 64, - .configuration_count = 1 -}; /** Keyboard callbacks.